From: Junio C Hamano <junkio@cox.net>
Date: Sat, 11 Feb 2006 02:47:41 +0000 (-0800)
Subject: Merge branch 'lt/diff-tree'
X-Git-Tag: v1.2.0~21
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=3f6726e1f112d221bd2a919e9b1b2927aeef6150;p=git.git

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
---

3f6726e1f112d221bd2a919e9b1b2927aeef6150