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)
commitf732d0b8576303403db2b1824cfd8b5a2fe632ef
tree3703587529fd562cb60280cdd5303e475bed6194
parent94c6eb3e88a3f220ffad513e54abbb599cedab6c
parentd416df8869d803282fb254a18505eccceee9ba3e
Merge branch 'lt/diff-tree'

* lt/diff-tree:
  combine-diff: Record diff status a bit more faithfully
  find_unique_abbrev() simplification.
diff.c