Merge branch 'jc/diff'
commita2c641c4ab66b5bdcb62c36a5f748b9f929d61b8
authorJunio C Hamano <junkio@cox.net>
Mon, 6 Feb 2006 07:55:45 +0000 (5 23:55 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 6 Feb 2006 07:55:45 +0000 (5 23:55 -0800)
treec7f414f8d89f51a19ff04ad04f19f25ecc643e6b
parent12db4852de8d377d317e5a7cf11467e5d4c5773d
parent45392a648d7449d237ecc2507bc92378bf920bf0
Merge branch 'jc/diff'

* jc/diff:
  git-diff-tree --stdin: show all parents.
  combine-diff: remove misguided --show-empty hack.