From: Elijah Newren <newren@gmail.com>
Date: Fri, 3 Aug 2018 23:09:23 +0000 (-0700)
Subject: t3031: update test description to mention desired behavior
X-Git-Tag: v2.19.0-rc0~42^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/69885ab0157ed41b1844baaaa5c91ed28941877b?ds=inline;hp=--cc

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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

69885ab0157ed41b1844baaaa5c91ed28941877b
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
 '