diff --git a/merge-recursive.h b/merge-recursive.h
index d1192f56d797a1664f5bfb5028d52ad679928e23..b831293b3865ae52584565039e4a893c3c6f45ff 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
enum {
MERGE_RECURSIVE_NORMAL = 0,
MERGE_RECURSIVE_OURS,
- MERGE_RECURSIVE_THEIRS,
+ MERGE_RECURSIVE_THEIRS
} recursive_variant;
const char *subtree_shift;
unsigned buffer_output : 1;
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