mergetool: Skip autoresolved paths

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 3ec9cbef2c88f65e5fb254d10cc551c6c4062c88..f2c73369a5b93544ee837229da965d7efbdc45bf 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -301,7 +301,7 @@ $expectfilter >expected <<\EOF
 EOF
 test_expect_success \
     'validate git diff-files output for a know cache/work tree state.' \
-    'git diff-files >current && diff >/dev/null -b current expected'
+    'git diff-files >current && test_cmp current expected >/dev/null'
 
 test_expect_success \
     'git update-index --refresh should succeed.' \