From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Sep 2007 06:13:08 +0000 (-0700)
Subject: Merge branch 'jn/web'
X-Git-Tag: v1.5.4-rc0~420
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4b2890773706d0340371571914f8f24036840e6;p=git.git

Merge branch 'jn/web'

* jn/web:
  gitweb: No difftree output for trivial merge
  gitweb: Remove parse_from_to_diffinfo code from git_patchset_body
---

e4b2890773706d0340371571914f8f24036840e6