Re: [PATCH] merge-recursive: do not look at the index during recursive merge

[Junio C Hamano]

Junio C Hamano <gits...@pobox.com> writes:

> + ...
> +     test_tick &&
> +     git commit --allow-empty -m "O2" &&
> +     O1=$(git rev-parse HEAD) &&
> +
> +     git reset --hard $O0 &&
> +     test_tick &&
> +     git commit --allow-empty -m "O2" &&
> +     O2=$(git rev-parse HEAD) &&

Does not affect the validity of the test at all, but the log message
of the $O1 should be made with -m "O1", not with -m "O2".  That fix
will be in the version I'll be queuing.

> +
> +     test_tick &&
> +     git merge -s ours $O1 &&
> +     B=$(git rev-parse HEAD) &&
> +
> +     git reset --hard $O1 &&
> +     test_tick &&
> +     git merge -s ours $O2 &&
> +     A=$(git rev-parse HEAD) &&
> +
> +     git merge $B
> +'
> +
>  test_done