Merge branch 'en/t3031-title-fix'

gitster · gitster · commit b576cf70b2d5 · 2018-08-17T13:09:58.000-07:00
Test fix.

* en/t3031-title-fix:
  t3031: update test description to mention desired behavior
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`