| commit | 014eec9738a1a2f3ed52d4e6af6432c1e1e110d5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Feb 2012 22:23:52 +0000 (10 14:23 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Feb 2012 22:23:52 +0000 (10 14:23 -0800) | ||
| tree | 7bffb25b988d7b1d2044b8fbc4e0d0338ff401d4 | treesnapshot (tar.gz zip) |
| parent | e9854c10a2f9894d9b20ff8b7ae35639b497409c | commitdiff |
| parent | 3adab6f3a7793253b22a4a7aae34221d19e0236a | commitdiff |
Merge branch 'jn/merge-no-edit-fix' into next
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
Conflicts:
builtin/merge.c
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
Conflicts:
builtin/merge.c
| builtin/merge.c | diff1 | diff2 | blobhistory |