Make "subtree" part more orthogonal to the rest of merge-recursive.

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