X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6029-merge-subtree.sh;h=43f5459c35dd862b2b15b9883a4f2354a20e8e25;hb=be4d2c83b68a96285cc05036add4d64d324e52d9;hp=35d66e804416af7f773d9eebcacb310f0e788884;hpb=1c536069780bc67c05e621f0485f787d04559f24;p=git.git diff --git a/t/t6029-merge-subtree.sh b/t/t6029-merge-subtree.sh index 35d66e804..43f5459c3 100755 --- a/t/t6029-merge-subtree.sh +++ b/t/t6029-merge-subtree.sh @@ -25,7 +25,7 @@ test_expect_success 'subtree available and works like recursive' ' git merge -s subtree side && for i in mundo $s world; do echo $i; done >expect && - diff -u expect hello + test_cmp expect hello '