commit,status: describe --porcelain just like push

[thirdparty/git.git] / builtin / merge-recursive.c
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c

index 3d00adbfc79aa0d5e4e6b3367bc5b70f8df36857..c33091b3ed52bc8539ff82f039ec8c7718f3dcc2 100644 (file)
--- 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 <base>... -- <head> <remote> ...";
@@ -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;
                 }