merge_options 527 builtin/checkout.c struct merge_options o; merge_options 28 builtin/merge-recursive.c struct merge_options o; merge_options 652 builtin/merge.c struct merge_options o; merge_options 106 merge-recursive.c struct merge_options *o, merge_options 146 merge-recursive.c static int show(struct merge_options *o, int v) merge_options 151 merge-recursive.c static void flush_output(struct merge_options *o) merge_options 160 merge-recursive.c static void output(struct merge_options *o, int v, const char *fmt, ...) merge_options 178 merge-recursive.c static void output_commit_title(struct merge_options *o, struct commit *commit) merge_options 249 merge-recursive.c struct tree *write_tree_from_memory(struct merge_options *o) merge_options 282 merge-recursive.c struct merge_options *o = context; merge_options 295 merge-recursive.c static int get_files_dirs(struct merge_options *o, struct tree *tree) merge_options 387 merge-recursive.c static void record_df_conflict_files(struct merge_options *o, merge_options 473 merge-recursive.c static struct string_list *get_renames(struct merge_options *o, merge_options 577 merge-recursive.c static int remove_file(struct merge_options *o, int clean, merge_options 610 merge-recursive.c static char *unique_path(struct merge_options *o, const char *path, const char *branch) merge_options 684 merge-recursive.c static int make_room_for_path(struct merge_options *o, const char *path) merge_options 736 merge-recursive.c static void update_file_flags(struct merge_options *o, merge_options 808 merge-recursive.c static void update_file(struct merge_options *o, merge_options 826 merge-recursive.c static int merge_3way(struct merge_options *o, merge_options 888 merge-recursive.c static struct merge_file_info merge_file_1(struct merge_options *o, merge_options 965 merge-recursive.c merge_file_special_markers(struct merge_options *o, merge_options 990 merge-recursive.c static struct merge_file_info merge_file_one(struct merge_options *o, merge_options 1010 merge-recursive.c static void handle_change_delete(struct merge_options *o, merge_options 1067 merge-recursive.c static void conflict_rename_delete(struct merge_options *o, merge_options 1117 merge-recursive.c static void handle_file(struct merge_options *o, merge_options 1162 merge-recursive.c static void conflict_rename_rename_1to2(struct merge_options *o, merge_options 1217 merge-recursive.c static void conflict_rename_rename_2to1(struct merge_options *o, merge_options 1269 merge-recursive.c static int process_renames(struct merge_options *o, merge_options 1568 merge-recursive.c static void handle_modify_delete(struct merge_options *o, merge_options 1582 merge-recursive.c static int merge_content(struct merge_options *o, merge_options 1687 merge-recursive.c static int process_entry(struct merge_options *o, merge_options 1803 merge-recursive.c int merge_trees(struct merge_options *o, merge_options 1892 merge-recursive.c int merge_recursive(struct merge_options *o, merge_options 1993 merge-recursive.c int merge_recursive_generic(struct merge_options *o, merge_options 2027 merge-recursive.c static void merge_recursive_config(struct merge_options *o) merge_options 2035 merge-recursive.c void init_merge_options(struct merge_options *o) merge_options 2037 merge-recursive.c memset(o, 0, sizeof(struct merge_options)); merge_options 2055 merge-recursive.c int parse_merge_opt(struct merge_options *o, const char *s) merge_options 33 merge-recursive.h int merge_recursive(struct merge_options *o, merge_options 40 merge-recursive.h int merge_trees(struct merge_options *o, merge_options 50 merge-recursive.h int merge_recursive_generic(struct merge_options *o, merge_options 57 merge-recursive.h void init_merge_options(struct merge_options *o); merge_options 58 merge-recursive.h struct tree *write_tree_from_memory(struct merge_options *o); merge_options 60 merge-recursive.h int parse_merge_opt(struct merge_options *out, const char *s); merge_options 280 sequencer.c struct merge_options o;