X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=d1192f56d797a1664f5bfb5028d52ad679928e23;hb=d5f5d0a9443c3892cdf9665ed8e0f9004706ed65;hp=d8bc7299ee3a70484b2436afd3799fe6f7608422;hpb=c214f2c80c70c2a3803bf1f3efc323cee5496024;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index d8bc7299e..d1192f56d 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -4,9 +4,15 @@
 #include "string-list.h"
 
 struct merge_options {
+	const char *ancestor;
 	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;