X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fmerge-recursive.c;h=c33091b3ed52bc8539ff82f039ec8c7718f3dcc2;hb=75b17fee72a0f78e0ad31728771231f8b3ed4d56;hp=3d00adbfc79aa0d5e4e6b3367bc5b70f8df36857;hpb=e78d01bf4e29ec92b4aa466ea0a49ae4be388ca9;p=git.git
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 3d00adbfc..c33091b3e 100644
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -2,6 +2,7 @@
#include "commit.h"
#include "tag.h"
#include "merge-recursive.h"
+#include "xdiff-interface.h"
static const char builtin_merge_recursive_usage[] =
"git %s ... -- ...";
@@ -40,15 +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 (parse_merge_opt(&o, arg + 2))
die("Unknown option %s", arg);
continue;
}