X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1200-tutorial.sh;h=3264fefbad8b941bd90b243948f618b65fe4929f;hb=8c5cea0095ee57c36fddfb9016810c230ce26557;hp=bfa2c2190d0368eba533a8411df739eee77fa1be;hpb=73e7b2ef6c62b3ec345b557acb71a8da4798c70d;p=git.git

diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index bfa2c2190..3264fefba 100755
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -163,7 +163,10 @@ test_expect_success 'git resolve' '
 	git checkout mybranch &&
 	git merge -m "Merge upstream changes." master |
 		sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
-		-e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output &&
+		-e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output
+'
+
+test_expect_success C_LOCALE_OUTPUT 'git resolve output' '
 	test_cmp resolve.expect resolve.output
 '