![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 10 Jul 2006 07:53:39 +0000 (00:53 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 10 Jul 2006 07:53:39 +0000 (00:53 -0700) |
* jc/show-merge:
git log -p --merge [[--] paths...]
git log -p --merge [[--] paths...]
Trivial merge