t3031: update test description to mention desired behavior

newren · gitster · commit 69885ab0157e · 2018-08-06T08:17:40.000-07:00
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 &lt;newren@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ test_expect_success 'setup repo with criss-cross history' '`
`88`	`88`	`git branch G`
`89`	`89`	`'`
`90`	`90`
`91`		`-test_expect_success 'recursive merge between F and G, causes segfault' '`
	`91`	`+test_expect_success 'recursive merge between F and G does not cause segfault' '`
`92`	`92`	`git merge F`
`93`	`93`	`'`
`94`	`94`