![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Feb 2012 06:41:51 +0000 (22:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Feb 2012 06:41:51 +0000 (22:41 -0800) |
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
Conflicts:
builtin/merge.c
merge: do not launch an editor on "--no-edit $tag"
Conflicts:
builtin/merge.c
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/merge.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/merge.c
Simple merge