Elijah Newren <new...@gmail.com> writes:
> This test description looks like it was written with the originally
> observed behavior ("causes segfault") rather than the desired and now
> current behavior ("does not cause segfault"). Fix it.
GOod.
>
> Signed-off-by: Elijah Newren <new...@gmail.com>
> ---
> t/t3031-merge-criscross.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t3031-merge-criscross.sh b/t/t3031-merge-criscross.sh
> index e59b0a32d6..3824756a02 100755
> --- a/t/t3031-merge-criscross.sh
> +++ b/t/t3031-merge-criscross.sh
> @@ -88,7 +88,7 @@ test_expect_success 'setup repo with criss-cross history' '
> git branch G
> '
>
> -test_expect_success 'recursive merge between F and G, causes segfault' '
> +test_expect_success 'recursive merge between F and G does not cause
> segfault' '
> git merge F
> '
