Elijah Newren writes:
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 2ecf495cc2..780f81a8bd 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -1952,6 +1952,13 @@ int merge_trees(struct merge_options *o,
> }
>
> if (oid_eq(>object.oid,
Elijah Newren writes:
> builtin/merge.c contains this important requirement for merge strategies:
> /*
>* At this point, we need a real merge. No matter what strategy
>* we use, it would operate on the index, possibly affecting the
>* working
builtin/merge.c contains this important requirement for merge strategies:
/*
* At this point, we need a real merge. No matter what strategy
* we use, it would operate on the index, possibly affecting the
* working tree, and when resolved cleanly, have the
3 matches
Mail list logo