Tests on Windows: $(pwd) must return Windows-style paths

[git.git] / t / t6031-merge-recursive.sh

diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index 5bb6b93780273be6504867f07b864e5ea0194e4d..41c6860be239a2abbab8b66ad8d4909b8913a9cc 100755 (executable)
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -12,8 +12,7 @@ test_expect_success 'mode change in one branch: keep changed version' '
        git add dummy &&
        git commit -m a &&
        git checkout -b b1 master &&
-       chmod +x file1 &&
-       git add file1 &&
+       test_chmod +x file1 &&
        git commit -m b1 &&
        git checkout a1 &&
        git merge-recursive master -- a1 b1 &&
@@ -25,8 +24,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
        git checkout -b a2 master &&
        : >file2 &&
        H=$(git hash-object file2) &&
-       chmod +x file2 &&
-       git add file2 &&
+       test_chmod +x file2 &&
        git commit -m a2 &&
        git checkout -b b2 master &&
        : >file2 &&
@@ -42,7 +40,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
                echo "100755 $H 2       file2"
                echo "100644 $H 3       file2"
        ) >expect &&
-       diff -u actual expect &&
+       test_cmp actual expect &&
        test -x file2
 '