Merge branch 'gp/gitweb'

[git.git] / t / t3404-rebase-interactive.sh

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 9c0acc5a7e59bb1279d0f512ceed4b698d39474d..9cf873f7ebfa8f8a4fd215cbbb468f955d6a47e3 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -146,8 +146,8 @@ EOF
 test_expect_success 'stop on conflicting pick' '
        git tag new-branch1 &&
        ! git rebase -i master &&
-       diff -u expect .git/.dotest-merge/patch &&
-       diff -u expect2 file1 &&
+       test_cmp expect .git/.dotest-merge/patch &&
+       test_cmp expect2 file1 &&
        test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) &&
        test 0 = $(grep -c "^[^#]" < .git/.dotest-merge/git-rebase-todo)
 '