checkout -m path: fix recreating conflicts

diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index 22ef7d44b08ac7ec20e799a194e27205c794c290..caea292f15437f50fd324496ff511971cc9d1d0c 100755 (executable)
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -125,7 +125,7 @@ echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file
 test_expect_success 'force diff with "diff"' '
        echo >.gitattributes "file diff" &&
        git diff >actual &&
-       test_cmp ../t4020/diff.NUL actual
+       test_cmp "$TEST_DIRECTORY"/t4020/diff.NUL actual
 '
 
 test_done