merge_trees(): add ancestor label parameter for diff3-style output

[git/git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index be8410a..d1192f5 100644 (file)
--- 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 {