![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 9 May 2007 07:23:41 +0000 (00:23 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 9 May 2007 07:23:41 +0000 (00:23 -0700) | ||
| commit | a6261668549ed2b1c52b526e87a097c2703443fa | |
| tree | d4d0d588c33a8c9f3948ca16146efa106d375f7b | tree | snapshot |
| parent | 467592ea926d105e1cb78b2471b28bf37e8c62c6 | commit | diff |
| parent | 208ecb2e860364aeffb22eb1f644db077b1c5162 | commit | diff |
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
* 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