From: Junio C Hamano Date: Wed, 9 May 2007 07:23:41 +0000 (-0700) Subject: Merge branch 'jn/gitweb' X-Git-Tag: v1.5.2-rc3~13 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a6261668549ed2b1c52b526e87a097c2703443fa;p=git.git Merge branch 'jn/gitweb' * jn/gitweb: gitweb: Show combined diff for merge commits in 'commit' view gitweb: Show combined diff for merge commits in 'commitdiff' view gitweb: Make it possible to use pre-parsed info in git_difftree_body gitweb: Add combined diff support to git_patchset_body gitweb: Add combined diff support to git_difftree_body gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line --- a6261668549ed2b1c52b526e87a097c2703443fa