Code

Merge branch 'lt/diff-tree'
authorJunio C Hamano <junkio@cox.net>
Sat, 11 Feb 2006 02:47:41 +0000 (18:47 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 11 Feb 2006 02:47:41 +0000 (18:47 -0800)
commit3f6726e1f112d221bd2a919e9b1b2927aeef6150
tree9ee388cce7c0ce7f5db55f5de0379b48212e7229
parent9ae6be80163669db921e6522140900da41753ed5
parentd416df8869d803282fb254a18505eccceee9ba3e
Merge branch 'lt/diff-tree'

* lt/diff-tree:
  combine-diff: Record diff status a bit more faithfully
  find_unique_abbrev() simplification.
  combine-diff: move formatting logic to show_combined_diff()
  combined-diff: use diffcore before intersecting paths.
  diff-tree -c raw output