From: Junio C Hamano <junkio@cox.net>
Date: Fri, 10 Feb 2006 14:51:28 +0000 (-0800)
Subject: Merge branch 'lt/diff-tree'
X-Git-Tag: v1.3.0-rc1~54^2~86
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=f732d0b8576303403db2b1824cfd8b5a2fe632ef;p=git.git

Merge branch 'lt/diff-tree'

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

f732d0b8576303403db2b1824cfd8b5a2fe632ef