From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Apr 2012 20:09:21 +0000 (-0700)
Subject: Sync with 1.7.9.6
X-Git-Tag: v1.7.10-rc4~2
X-Git-Url: https://git.tokkee.org/?p=git.git;a=commitdiff_plain;h=d82829b6128263951569221ca0c00dd143da055c

Sync with 1.7.9.6
---

d82829b6128263951569221ca0c00dd143da055c
diff --cc builtin/merge.c
index cb8f14910,5126443fd..08e01e8a6
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@@ -1325,11 -1323,11 +1325,8 @@@ int cmd_merge(int argc, const char **ar
  		if (!fast_forward_only &&
  		    merge_remote_util(commit) &&
  		    merge_remote_util(commit)->obj &&
--		    merge_remote_util(commit)->obj->type == OBJ_TAG) {
--			if (option_edit < 0)
- 				option_edit = 1;
 -				option_edit = default_edit_option();
++		    merge_remote_util(commit)->obj->type == OBJ_TAG)
  			allow_fast_forward = 0;
--		}
  	}
  
  	if (option_edit < 0)