branch | stable |
changeset 24809 | 32d0d2f38910 |
parent 24121 | 9d0b6ef92eb2 |
child 24843 | 21b33f0460e0 |
--- a/tests/test-merge-tools.t Fri Apr 17 12:39:55 2015 -0400 +++ b/tests/test-merge-tools.t Fri Apr 17 15:42:20 2015 -0500 @@ -105,9 +105,11 @@ 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 @@ [1] $ rm false +#endif + executable directory in $PATH shouldn't be found: $ mkdir false