merge-recursive: expose merge options for builtin merge

[git.git] / merge-recursive.h

diff --git a/merge-recursive.h b/merge-recursive.h
index c5fbe796bb799d02d115420d16657788acc1f0d8..37ff99a2981dc618acdd5c7b1197ba20b9a53f4b 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -55,6 +55,8 @@ 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);
 
+int parse_merge_opt(struct merge_options *out, const char *s);
+
 /* builtin/merge.c */
 int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);