![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 26 Mar 2006 08:22:48 +0000 (00:22 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 26 Mar 2006 08:22:48 +0000 (00:22 -0800) |
* jc/merge:
git-merge knows some strategies want to skip trivial merges
git-merge knows some strategies want to skip trivial merges
Trivial merge