Testsuite: Unset CVS_SERVER

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 9ab5bdacc41d026ea81c65b0d95a61a61521429a..26cf8dc7c15ce397d7c36b2dd39a9d38db9856d7 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -126,7 +126,7 @@ verify_merge() {
                echo "[OOPS] unmerged files"
                false
        fi &&
-       if ! git diff --exit-code
+       if test_must_fail git diff --exit-code
        then
                echo "[OOPS] working tree != index"
                false