From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Feb 2012 06:41:51 +0000 (-0800)
Subject: Merge branch 'jn/merge-no-edit-fix'
X-Git-Tag: v1.7.10-rc0~105
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5cdc9fbb0894023da8e4dab552dfdda8b662feab;p=git.git

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
---

5cdc9fbb0894023da8e4dab552dfdda8b662feab