Merge branch 'jc/fixdiff'
commitc611db196a8830135e1a03e5b4fa6502714ded24
authorJunio C Hamano <junkio@cox.net>
Sun, 12 Feb 2006 13:02:25 +0000 (12 05:02 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 12 Feb 2006 13:02:25 +0000 (12 05:02 -0800)
tree696f6a3ab5fc4afae7f301ff10526a5e4b8c1278
parent4890f62bc02929b174ff5fa0e3656ea3d40f0e57
parent6932c78cb4485380a8ff63575a47a58a4e308bfd
Merge branch 'jc/fixdiff'

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