diff options
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index b831293b38..52f0201f68 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -14,18 +14,22 @@ struct merge_options { } recursive_variant; const char *subtree_shift; unsigned buffer_output : 1; + unsigned renormalize : 1; + long xdl_opts; int verbosity; + int detect_rename; 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; struct string_list current_directory_set; + struct string_list df_conflict_file_set; }; -/* Return a list of user-friendly error messages to be used by merge */ -struct unpack_trees_error_msgs get_porcelain_error_msgs(void); - /* merge_trees() but with recursive ancestor consolidation */ int merge_recursive(struct merge_options *o, struct commit *h1, @@ -54,7 +58,6 @@ 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); +int parse_merge_opt(struct merge_options *out, const char *s); #endif |