typofix: cherry is spelled with two ars

gitster · gitster · commit 7a96c3864eea · 2013-09-05T14:51:17.000-07:00
Do not say chery; it is spelled cherry.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
@@ -100,7 +100,7 @@ test_expect_success 'revert forbidden on dirty working tree' '
 
 '
 
-test_expect_success 'chery-pick on unborn branch' '
+test_expect_success 'cherry-pick on unborn branch' '
 	git checkout --orphan unborn &&
 	git rm --cached -r . &&
 	rm -rf * &&
diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh
@@ -105,7 +105,7 @@ test_expect_success 'cherry pick a root commit with --ff' '
 	test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1"
 '
 
-test_expect_success 'chery-pick --ff on unborn branch' '
+test_expect_success 'cherry-pick --ff on unborn branch' '
 	git checkout --orphan unborn &&
 	git rm --cached -r . &&
 	rm -rf * &&

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ test_expect_success 'revert forbidden on dirty working tree' '`
`100`	`100`
`101`	`101`	`'`
`102`	`102`
`103`		`-test_expect_success 'chery-pick on unborn branch' '`
	`103`	`+test_expect_success 'cherry-pick on unborn branch' '`
`104`	`104`	`git checkout --orphan unborn &&`
`105`	`105`	`git rm --cached -r . &&`
`106`	`106`	`rm -rf * &&`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ test_expect_success 'cherry pick a root commit with --ff' '`
`105`	`105`	`test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1"`
`106`	`106`	`'`
`107`	`107`
`108`		`-test_expect_success 'chery-pick --ff on unborn branch' '`
	`108`	`+test_expect_success 'cherry-pick --ff on unborn branch' '`
`109`	`109`	`git checkout --orphan unborn &&`
`110`	`110`	`git rm --cached -r . &&`
`111`	`111`	`rm -rf * &&`