Mercurial > public > mercurial-scm > hg

diff tests/test-merge-tools.t @ 17902:195ad823b5d5 stable 2.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix test for issue3581 for vfat on Linux
author Matt Mackall <mpm@selenic.com>
date Thu, 01 Nov 2012 14:59:55 -0500
parents a19046744e4e
children d084df89d948
line wrap: on
line diff
--- a/tests/test-merge-tools.t	Tue Oct 30 17:23:51 2012 -0700
+++ b/tests/test-merge-tools.t	Thu Nov 01 14:59:55 2012 -0500
@@ -774,8 +774,10 @@
   M f
 
 Issue3581: Merging a filename that needs to be quoted
+(This test doesn't work on Windows filesystems even on Linux, so check
+for Unix-like permission)
 
-#if no-windows
+#if unix-permissions
   $ beforemerge
   [merge-tools]
   false.whatever=