Merge branch 'ks/t3200-typofix'

gitster · gitster · commit 564710379b4a · 2018-03-21T11:30:12.000-07:00
Test typofix.

* ks/t3200-typofix:
  t/t3200: fix a typo in a test description
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
@@ -528,7 +528,7 @@ test_expect_success 'git branch -c -f o/q o/p should work when o/p exists' '
 	git branch -c -f o/q o/p
 '
 
-test_expect_success 'git branch -c qq rr/qq should fail when r exists' '
+test_expect_success 'git branch -c qq rr/qq should fail when rr exists' '
 	git branch qq &&
 	git branch rr &&
 	test_must_fail git branch -c qq rr/qq

Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ test_expect_success 'git branch -c -f o/q o/p should work when o/p exists' '`
`528`	`528`	`git branch -c -f o/q o/p`
`529`	`529`	`'`
`530`	`530`
`531`		`-test_expect_success 'git branch -c qq rr/qq should fail when r exists' '`
	`531`	`+test_expect_success 'git branch -c qq rr/qq should fail when rr exists' '`
`532`	`532`	`git branch qq &&`
`533`	`533`	`git branch rr &&`
`534`	`534`	`test_must_fail git branch -c qq rr/qq`