git merge -X<option>

[git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index fd138ca14006843a7ce0c38cfde4de580d5ce36e..39de100cd5dcac1a643d1562abf5c8f73877dec1 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -6,7 +6,11 @@
 struct merge_options {
        const char *branch1;
        const char *branch2;
-       unsigned subtree_merge : 1;
+       enum {
+               MERGE_RECURSIVE_SUBTREE = 1,
+               MERGE_RECURSIVE_OURS,
+               MERGE_RECURSIVE_THEIRS,
+       } recursive_variant;
        unsigned buffer_output : 1;
        int verbosity;
        int diff_rename_limit;