Merge branch 'maint'

[git.git] / t / t6120-describe.sh

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index c6bfef5f47f41cee2011af664123e30308c7af49..c6be2597f73dbd49e6301d01b5ea3c86ac8c34cb 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -108,7 +108,7 @@ warning: tag 'A' is really 'Q' here
 EOF
 check_describe A-* HEAD
 test_expect_success 'warning was displayed for Q' '
-       git diff err.expect err.actual
+       test_cmp err.expect err.actual
 '
 test_expect_success 'rename tag Q back to A' '
        mv .git/refs/tags/Q .git/refs/tags/A