![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 6 Feb 2006 07:55:45 +0000 (23:55 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| 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.
git-diff-tree --stdin: show all parents.
combine-diff: remove misguided --show-empty hack.
Trivial merge