merge_trees       570 builtin/checkout.c 			merge_trees(&o, new->commit->tree, work,
merge_trees        28 builtin/merge-tree.c static void merge_trees(struct tree_desc t[3], const char *base);
merge_trees       222 builtin/merge-tree.c 	merge_trees(t, newbase);
merge_trees       372 builtin/merge-tree.c 	merge_trees(t, "");
merge_trees      1962 merge-recursive.c 	clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
merge_trees        40 merge-recursive.h int merge_trees(struct merge_options *o,
merge_trees       302 sequencer.c    	clean = merge_trees(&o,