merge-one-file: fix broken merges with alternate work trees

diff --git a/merge-recursive.h b/merge-recursive.h
index d8bc7299ee3a70484b2436afd3799fe6f7608422..be8410ad1803bc10e5dbf74f39eecdfed53469b1 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -6,7 +6,12 @@
 struct merge_options {
        const char *branch1;
        const char *branch2;
-       unsigned subtree_merge : 1;
+       enum {
+               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;