try_merge_strategy 1536 builtin/merge.c ret = try_merge_strategy(use_strategies[i]->name, try_merge_strategy 1607 builtin/merge.c try_merge_strategy(best_strategy, common, remoteheads,