Merge branch 'lt/diff-tree'
authorJunio C Hamano <junkio@cox.net>
Fri, 10 Feb 2006 14:51:28 +0000 (06:51 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 10 Feb 2006 14:51:28 +0000 (06:51 -0800)
* lt/diff-tree:
  combine-diff: Record diff status a bit more faithfully
  find_unique_abbrev() simplification.

1  2 
diff.c

diff --cc diff.c
Simple merge