tests/test-merge-tools.t

--- a/tests/test-merge-tools.t	Fri Jun 15 00:02:27 2012 +0200
+++ b/tests/test-merge-tools.t	Fri Jun 15 00:02:27 2012 +0200
@@ -277,6 +277,8 @@
   # hg stat
   M f
 
+#if unix-permissions
+
 environment variables in true.executable are handled:
 
   $ echo 'echo "custom merge tool"' > "$HGTMP/merge.sh"
@@ -300,6 +302,8 @@
   # hg stat
   M f
 
+#endif
+
 Tool selection and merge-patterns
 
 merge-patterns specifies new tool false: