![[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) | ||
| commit | 42e283a1bfd0651fd2e6264157ecbe8841511788 | |
| tree | d5b1e1235c93e4cad18dd37894e8cb7bd2be4adf | tree | snapshot |
| parent | 58d4203aa617293d1dc3746a1ea33d84eb766e0f | commit | diff |
| parent | 3adab6f3a7793253b22a4a7aae34221d19e0236a | commit | diff |
Merge branch 'jn/merge-no-edit-fix' into maint
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"