Merge branch 'nd/checkout-noisy-unmerge'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 25e649c997bbe4dfa03f1eca1f1591181efab5a3..42b1a0aa7f0b8f5b06735293089f640b7f228f62 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1258,7 +1258,7 @@ test -d "$GIT_BUILD_DIR"/templates/blt || {
        error "You haven't built things yet, have you?"
 }
 
-if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool
+if ! test -x "$GIT_BUILD_DIR"/t/helper/test-tool$X
 then
        echo >&2 'You need to build test-tool:'
        echo >&2 'Run "make t/helper/test-tool" in the source (toplevel) directory'