diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t --- a/tests/test-merge-tools.t +++ b/tests/test-merge-tools.t @@ -105,9 +105,11 @@ simplest hgrc using false for merge: M f ? f.orig +#if unix-permissions + unexecutable file in $PATH shouldn't be found: - $ touch false + $ echo "echo fail" > false $ hg up -qC 1 $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2 merging f @@ -118,6 +120,8 @@ unexecutable file in $PATH shouldn't be [1] $ rm false +#endif + executable directory in $PATH shouldn't be found: $ mkdir false