Sync with 1.7.9.6

diff --cc builtin/merge.c
index cb8f149,5126443..08e01e8
--- 1/builtin/merge.c
--- 2/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)