Merge branch 'da/difftool-mergetool-simplify-reporting-status'

diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index 582d0b54f1f1a32459727e59932e95c4b466951f..9ceaa4049f960f20ca37d58e58e9e6c4e9ff4398 100755 (executable)
--- a/t/t7012-skip-worktree-writing.sh
+++ b/t/t7012-skip-worktree-writing.sh
@@ -54,7 +54,7 @@ test_expect_success 'read-tree removes worktree, dirty case' '
 '
 
 NULL_SHA1=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-ZERO_SHA0=0000000000000000000000000000000000000000
+
 setup_absent() {
        test -f 1 && rm 1
        git update-index --remove 1 &&
@@ -127,13 +127,13 @@ EOF
 test_expect_success 'git-clean, absent case' '
        setup_absent &&
        git clean -n > result &&
-       test_cmp expected result
+       test_i18ncmp expected result
 '
 
 test_expect_success 'git-clean, dirty case' '
        setup_dirty &&
        git clean -n > result &&
-       test_cmp expected result
+       test_i18ncmp expected result
 '
 
 #TODO test_expect_failure 'git-apply adds file' false