diff options
Diffstat (limited to 'third_party/git/builtin/merge-recursive.c')
| -rw-r--r-- | third_party/git/builtin/merge-recursive.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/third_party/git/builtin/merge-recursive.c b/third_party/git/builtin/merge-recursive.c index a4bfd8fc51..5b910e351e 100644 --- a/third_party/git/builtin/merge-recursive.c +++ b/third_party/git/builtin/merge-recursive.c @@ -1,4 +1,3 @@ -#include "cache.h" #include "builtin.h" #include "commit.h" #include "tag.h" @@ -64,9 +63,6 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) if (argc - i != 3) /* "--" "<head>" "<remote>" */ die(_("not handling anything other than two heads merge.")); - if (repo_read_index_unmerged(the_repository)) - die_resolve_conflict("merge"); - o.branch1 = argv[++i]; o.branch2 = argv[++i]; |