diff options
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index c8135b0ec7..80d69d1401 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -13,17 +13,20 @@ struct merge_options { MERGE_RECURSIVE_THEIRS } recursive_variant; const char *subtree_shift; - unsigned buffer_output : 1; + unsigned buffer_output; /* 1: output at end, 2: keep buffered */ 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 hashmap current_file_dir_set; + struct string_list df_conflict_file_set; }; /* merge_trees() but with recursive ancestor consolidation */ @@ -45,10 +48,10 @@ int merge_trees(struct merge_options *o, * virtual commits and call merge_recursive() proper. */ int merge_recursive_generic(struct merge_options *o, - const unsigned char *head, - const unsigned char *merge, + const struct object_id *head, + const struct object_id *merge, int num_ca, - const unsigned char **ca, + const struct object_id **ca, struct commit **result); void init_merge_options(struct merge_options *o); @@ -56,7 +59,4 @@ 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); - #endif |