X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1000-read-tree-m-3way.sh;h=22ba7a5442c587f4536aad5668df43661231de56;hb=0f7a8f2dba5aeb8ce8ab4a710a1d1310705f7f08;hp=17f519f547356d550c16668b929d9140b568a6f7;hpb=eed81838f0d0e031702473e1d427d71055134edd;p=git.git

diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh
index 17f519f54..22ba7a544 100755
--- a/t/t1000-read-tree-m-3way.sh
+++ b/t/t1000-read-tree-m-3way.sh
@@ -72,7 +72,7 @@ In addition:
 
 '
 . ./test-lib.sh
-. ../lib-read-tree-m-3way.sh
+. "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
 
 ################################################################
 # Trivial "majority when 3 stages exist" merge plus #2ALT, #3ALT
@@ -131,7 +131,7 @@ _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 
 check_result () {
     git ls-files --stage | sed -e 's/ '"$_x40"' / X /' >current &&
-    git diff expected current
+    test_cmp expected current
 }
 
 # This is done on an empty work directory, which is the normal