Merge branch 'jn/merge-no-edit-fix'
* jn/merge-no-edit-fix: merge: do not launch an editor on "--no-edit $tag" Conflicts: builtin/merge.c
Junio C Hamano committed
Feb 12, 2012 at 22:41 UTC
5cdc9fbb0894023da8e4dab552dfdda8b662feab
No changes.