"Victoria Dye via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
> - if (merge_recursive_generic(&o, &our_tree, &their_tree, 1, bases, &result)) {
> + if (merge_recursive_generic(&o, &our_tree, &their_tree, 1, bases, merge_recursive, &result)) {
This one does need input from Elijah to properly evaluate. Off the
top of my head, I wonder if the choice of the merge function should
be part of "struct merge_options".
