diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 7e6db3bb35..ed0f959ac4 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1324,7 +1324,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix) merge_remote_util(commit) && merge_remote_util(commit)->obj && merge_remote_util(commit)->obj->type == OBJ_TAG) { - option_edit = 1; + if (option_edit < 0) + option_edit = 1; allow_fast_forward = 0; } } |