Merge branch 'jn/web' into maint
commitd3f3ab264fa2c332fc451a5f97e25fc5c0551f1a
authorJunio C Hamano <gitster@pobox.com>
Tue, 25 Sep 2007 22:17:22 +0000 (25 15:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 25 Sep 2007 22:17:22 +0000 (25 15:17 -0700)
tree48c46de0a5cd9df5147a17df562d52c855564ffd
parentd1637a07f684acd80007723f94c4da9649d85525
parent3ef408aefe937fe76559e9b41602cddc0ac8af8c
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