[PATCH] filemerge: only run test for issue3581 on non-windows environments

Keegan Carruthers-Smith keegancsmith at fb.com
Tue Oct 30 19:25:08 CDT 2012


# HG changeset patch
# User Keegan Carruthers-Smith <keegancsmith at fb.com>
# Date 1351643031 25200
# Branch stable
# Node ID f981f349ff0d9fe4886ef7c96f16447608a2a0a2
# Parent  9a2cf955db84740077503291cb45c1aa8603c213
filemerge: only run test for issue3581 on non-windows environments

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
@@ -775,6 +775,7 @@
 
 Issue3581: Merging a filename that needs to be quoted
 
+#if no-windows
   $ beforemerge
   [merge-tools]
   false.whatever=
@@ -796,6 +797,7 @@
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg update -C 1 > /dev/null
+#endif
 
 Merge post-processing
 


More information about the Mercurial-devel mailing list