X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=merge-recursive.h;h=c2b7bb65c62ff51af1b89087bbf6692060b5962e;hb=0454220d66581f28b9688bc1b687f52cb9561798;hp=e6a0828ecacd81d820feb8caa07c90707e97f8b4;hpb=61c51acf7d2e01b968745aaa53de877135be28ec;p=thirdparty%2Fgit.git

diff --git a/merge-recursive.h b/merge-recursive.h
index e6a0828eca..c2b7bb65c6 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -6,6 +6,8 @@
 
 struct commit;
 
+struct repository;
+
 struct merge_options {
 	const char *ancestor;
 	const char *branch1;
@@ -34,6 +36,7 @@ struct merge_options {
 	struct string_list df_conflict_file_set;
 	struct unpack_trees_options unpack_opts;
 	struct index_state orig_index;
+	struct repository *repo;
 };
 
 /*
@@ -92,7 +95,8 @@ int merge_recursive_generic(struct merge_options *o,
 			    const struct object_id **ca,
 			    struct commit **result);
 
-void init_merge_options(struct merge_options *o);
+void init_merge_options(struct merge_options *o,
+			struct repository *repo);
 struct tree *write_tree_from_memory(struct merge_options *o);
 
 int parse_merge_opt(struct merge_options *out, const char *s);