X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.h;h=b831293b3865ae52584565039e4a893c3c6f45ff;hb=16bfbe6352e90b87de26effe5ce120ab74ebafc7;hp=be8410ad1803bc10e5dbf74f39eecdfed53469b1;hpb=8165952517bf82b6a632cefc047ad14f36a74b25;p=git.git

diff --git a/merge-recursive.h b/merge-recursive.h
index be8410ad1..b831293b3 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -4,12 +4,13 @@
 #include "string-list.h"
 
 struct merge_options {
+	const char *ancestor;
 	const char *branch1;
 	const char *branch2;
 	enum {
 		MERGE_RECURSIVE_NORMAL = 0,
 		MERGE_RECURSIVE_OURS,
-		MERGE_RECURSIVE_THEIRS,
+		MERGE_RECURSIVE_THEIRS
 	} recursive_variant;
 	const char *subtree_shift;
 	unsigned buffer_output : 1;
@@ -53,4 +54,7 @@ int merge_recursive_generic(struct merge_options *o,
 void init_merge_options(struct merge_options *o);
 struct tree *write_tree_from_memory(struct merge_options *o);
 
+/* builtin/merge.c */
+int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
+
 #endif