##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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