From 69885ab0157ed41b1844baaaa5c91ed28941877b Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Fri, 3 Aug 2018 16:09:23 -0700 Subject: [PATCH] t3031: update test description to mention desired behavior 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. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- 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 ' -- 2.11.4.GIT