Try to find the optimum merge base while resolving.
The merge-base command acquires a new option, '--all', that causes it to output all the common ancestor candidates. The "git resolve" command then uses it to pick the optimum merge base by picking the one that results in the smallest number of nontrivial merges. Signed-off-by: Junio C Hamano <firstname.lastname@example.org>
Showing with 73 additions and 15 deletions