Merge branch 'jn/merge-no-edit-fix' into maint
commit42e283a1bfd0651fd2e6264157ecbe8841511788
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 07:24:02 +0000 (13 23:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 07:24:02 +0000 (13 23:24 -0800)
treed5b1e1235c93e4cad18dd37894e8cb7bd2be4adf
parent58d4203aa617293d1dc3746a1ea33d84eb766e0f
parent3adab6f3a7793253b22a4a7aae34221d19e0236a
Merge branch 'jn/merge-no-edit-fix' into maint

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