diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index d21cd290d3d8e3d912b94045f3d3d9db8bdd7e7d..7d182b5f11ca40b35a74aba04df1086bc91724be 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
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