##// END OF EJS Templates
filemerge: only run test for issue3581 on non-windows environments
Keegan Carruthers-Smith -
r17901:a1904674 stable
parent child Browse files
Show More
@@ -775,6 +775,7 b' Merge using tool with a path that must b'
775 775
776 776 Issue3581: Merging a filename that needs to be quoted
777 777
778 #if no-windows
778 779 $ beforemerge
779 780 [merge-tools]
780 781 false.whatever=
@@ -796,6 +797,7 b' Issue3581: Merging a filename that needs'
796 797 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
797 798 (branch merge, don't forget to commit)
798 799 $ hg update -C 1 > /dev/null
800 #endif
799 801
800 802 Merge post-processing
801 803
General Comments 0
You need to be logged in to leave comments. Login now