From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Sep 2007 22:17:22 +0000 (-0700)
Subject: Merge branch 'jn/web' into maint
X-Git-Tag: v1.5.3.3~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d3f3ab264fa2c332fc451a5f97e25fc5c0551f1a;p=git.git

Merge branch 'jn/web' into maint

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

d3f3ab264fa2c332fc451a5f97e25fc5c0551f1a