Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge-tools.t @ 16972:5efe9c6a34fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add some missing #if's / hghave requirements Seen on Linux with FAT.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 15 Jun 2012 00:02:27 +0200
parents 30cfa286947c
children 973c2b0b403c
line wrap: on
line diff
--- 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: