diff options
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index fd138ca140..7e1e972b13 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -4,13 +4,24 @@ #include "string-list.h" struct merge_options { + const char *ancestor; const char *branch1; const char *branch2; - unsigned subtree_merge : 1; + enum { + MERGE_RECURSIVE_NORMAL = 0, + MERGE_RECURSIVE_OURS, + MERGE_RECURSIVE_THEIRS + } recursive_variant; + const char *subtree_shift; unsigned buffer_output : 1; + unsigned renormalize : 1; + long xdl_opts; int verbosity; int diff_rename_limit; int merge_rename_limit; + int rename_score; + int needed_rename_limit; + int show_rename_progress; int call_depth; struct strbuf obuf; struct string_list current_file_set; @@ -45,4 +56,11 @@ 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, size_t xopts_nr, + const char **xopts, struct commit_list *common, + const char *head_arg, struct commit_list *remotes); + #endif |