# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2015-04-17 20:42:20
# Node ID 32d0d2f38910d4397b2a05c148e3fb0255588539
# Parent  d05ede9d3ecc4a03285a170ff9eb7b235868df5e

tests: fix portability issue with test-merge-tools

Not sure how this ever worked.

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