On 11/24/2020 6:53 AM, Alban Gruin wrote:
> This teaches `git merge' to invoke the "resolve" strategy with a
> function call instead of forking.
...
> @@ -740,6 +741,9 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
> COMMIT_LOCK | SKIP_IF_UNCHANGED))
> die(_("unable to write %s"), get_index_file());
> return clean ? 0 : 1;
> + } else if (!strcmp(strategy, "resolve")) {
> + return merge_strategies_resolve(the_repository, common,
> + head_arg, remoteheads);
> } else {
> return try_merge_command(the_repository,
> strategy, xopts_nr, xopts,
>
This is a very satisfying change.
Thanks,
-Stolee
