Merge branch 'jc/diff'
authorJunio C Hamano <redacted>
Mon, 6 Feb 2006 07:55:45 +0000 (23:55 -0800)
committerJunio C Hamano <redacted>
Mon, 6 Feb 2006 07:55:45 +0000 (23:55 -0800)
* jc/diff:
  git-diff-tree --stdin: show all parents.
  combine-diff: remove misguided --show-empty hack.


Trivial merge
git clone https://git.99rst.org/PROJECT