X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmerge-recursive.c;h=3a64f5d0bdbcc8d7d21edb01f285cc8b41755228;hb=716b64a73e65d7494dfb37631292fcbe8cb34cc0;hp=78b9db76a0819529e7f6cab44319acd2978c9e9b;hpb=eb4e67288bb9d66fb46092fa30d72c4bdded0c2a;p=git.git
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 78b9db76a..3a64f5d0b 100644
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -1,7 +1,8 @@
-#include "cache.h"
+#include "builtin.h"
#include "commit.h"
#include "tag.h"
#include "merge-recursive.h"
+#include "xdiff-interface.h"
static const char builtin_merge_recursive_usage[] =
"git %s ... -- ...";
@@ -40,19 +41,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
if (!prefixcmp(arg, "--")) {
if (!arg[2])
break;
- if (!strcmp(arg+2, "ours"))
- o.recursive_variant = MERGE_RECURSIVE_OURS;
- else if (!strcmp(arg+2, "theirs"))
- o.recursive_variant = MERGE_RECURSIVE_THEIRS;
- else if (!strcmp(arg+2, "subtree"))
- o.subtree_shift = "";
- else if (!prefixcmp(arg+2, "subtree="))
- o.subtree_shift = arg + 10;
- else if (!strcmp(arg+2, "renormalize"))
- o.renormalize = 1;
- else if (!strcmp(arg+2, "no-renormalize"))
- o.renormalize = 0;
- else
+ if (parse_merge_opt(&o, arg + 2))
die("Unknown option %s", arg);
continue;
}