From: Junio C Hamano <junkio@cox.net>
Date: Fri, 10 Feb 2006 05:10:52 +0000 (-0800)
Subject: Merge branch 'lt/diff-tree'
X-Git-Tag: v1.3.0-rc1~54^2~89
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bd6a9e885aec97999041307b76d73de4605f25db;p=git.git

Merge branch 'lt/diff-tree'

* lt/diff-tree:
  combine-diff: move formatting logic to show_combined_diff()
  combined-diff: use diffcore before intersecting paths.
  diff-tree -c raw output
---

bd6a9e885aec97999041307b76d73de4605f25db