Mercurial > hg-stable

changeset 17901:a19046744e4e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: only run test for issue3581 on non-windows environments
author Keegan Carruthers-Smith <keegancsmith@fb.com>
date Tue, 30 Oct 2012 17:23:51 -0700
parents 47fb48060e36
children 195ad823b5d5
files tests/test-merge-tools.t
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-merge-tools.t	Thu Nov 01 13:46:03 2012 +0100
+++ b/tests/test-merge-tools.t	Tue Oct 30 17:23:51 2012 -0700
@@ -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