Merge pull request #262 from dscho/fix-v2.26.1-test-failures

Fix v2.26.1 test failures

Author: dscho

t/t1092-virtualfilesystem.sh

@@ -70,7 +70,7 @@ test_expect_success 'verify status is clean' '
 		On branch master
 		nothing to commit, working tree clean
 	EOF
-	test_cmp expected actual
+	test_i18ncmp expected actual
 '
 
 test_expect_success 'verify skip-worktree bit is set for absolute path' '

t/t7524-serialized-status.sh

@@ -280,7 +280,7 @@ Unmerged paths:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git -C conflicts status --long >observed.long &&
-	test_cmp expect.long observed.long &&
+	test_i18ncmp expect.long observed.long &&
 
 	cat >expect.short <<EOF &&
 UU x.txt
@@ -300,7 +300,7 @@ EOF
 	# run status using the cached data.
 
 	git -C conflicts status --long --deserialize=../serialized >observed.long &&
-	test_cmp expect.long observed.long &&
+	test_i18ncmp expect.long observed.long &&
 
 	git -C conflicts status --short --deserialize=../serialized >observed.short &&
 	test_cmp expect.short observed.short &&