From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Feb 2012 07:24:02 +0000 (-0800)
Subject: Merge branch 'jn/merge-no-edit-fix' into maint
X-Git-Tag: v1.7.9.1~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=42e283a1bfd0651fd2e6264157ecbe8841511788;p=git.git

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

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

42e283a1bfd0651fd2e6264157ecbe8841511788