From: Junio C Hamano <junkio@cox.net>
Date: Sun, 12 Feb 2006 13:02:25 +0000 (-0800)
Subject: Merge branch 'jc/fixdiff'
X-Git-Tag: v1.2.0~11
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c611db196a8830135e1a03e5b4fa6502714ded24;p=git-core%2Fgit.git

Merge branch 'jc/fixdiff'

* jc/fixdiff:
  diff-tree: do not default to -c
---

c611db196a8830135e1a03e5b4fa6502714ded24