X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=merge-recursive.h;h=be8410ad1803bc10e5dbf74f39eecdfed53469b1;hb=0901d5a2ef80996cf64c8afeaec765e1bc09f795;hp=d8bc7299ee3a70484b2436afd3799fe6f7608422;hpb=cae7151e252324e9304d6480a74d89ba7ed9aa8f;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index d8bc7299e..be8410ad1 100644
--- 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;