# HG changeset patch
# User Keegan Carruthers-Smith <keegancsmith@fb.com>
# Date 2012-10-31 00:23:51
# Node ID a19046744e4e987847f0faea74241ff5dc68533c
# Parent  47fb48060e362d13b282144c83f13442d3f57adc

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 @@ Merge using tool with a path that must b
 
 Issue3581: Merging a filename that needs to be quoted
 
+#if no-windows
   $ beforemerge
   [merge-tools]
   false.whatever=
@@ -796,6 +797,7 @@ Issue3581: Merging a filename that needs
   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