![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Feb 2012 07:24:02 +0000 (23:24 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Feb 2012 07:24:02 +0000 (23:24 -0800) |
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
merge: do not launch an editor on "--no-edit $tag"
Trivial merge