Merge branch 'jn/web'
commite4b2890773706d0340371571914f8f24036840e6
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 06:13:08 +0000 (23 23:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2007 06:13:08 +0000 (23 23:13 -0700)
tree9065d0a5a4c12fa761c43af0cf1b372708cddc66
parent91d4b2ee816b565d298ee65fcf11d5aecd2d67dc
parent3ef408aefe937fe76559e9b41602cddc0ac8af8c
Merge branch 'jn/web'

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