X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=merge-recursive.h;h=d1192f56d797a1664f5bfb5028d52ad679928e23;hb=f4c2eb8b34571e645336484d2b444261a535faea;hp=be8410ad1803bc10e5dbf74f39eecdfed53469b1;hpb=c2b456b8956c2091318edaee362119e0e96b86b7;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index be8410ad1..d1192f56d 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -4,6 +4,7 @@
 #include "string-list.h"
 
 struct merge_options {
+	const char *ancestor;
 	const char *branch1;
 	const char *branch2;
 	enum {