![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Aug 2008 21:29:37 +0000 (14:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 24 Aug 2008 21:29:37 +0000 (14:29 -0700) |
* mv/maint-merge-fix:
merge: fix numerus bugs around "trivial merge" area
merge: fix numerus bugs around "trivial merge" area
Trivial merge