Merge branch 'jn/merge-no-edit-fix' into maint

* jn/merge-no-edit-fix: merge: do not launch an editor on "--no-edit $tag"

Junio C Hamano committed Feb 13, 2012 at 23:24 UTC 42e283a1bfd0651fd2e6264157ecbe8841511788

No changes.