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

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

test-merge-tools: stabilize for Windows...
Matt Harbison -
r37041:6bc2f1b3 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1385,7 +1385,7 b' Same test with experimental.mergetempdir'
1385 arg: "ll:working copy"
1385 arg: "ll:working copy"
1386 arg: "lo:"
1386 arg: "lo:"
1387 arg: "merge rev"
1387 arg: "merge rev"
1388 arg: "lb:base: $TESTTMP/hgmerge.*/f~base" (glob)
1388 arg: "lb:base: */hgmerge.*/f~base" (glob)
1389 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
1389 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
1390 (branch merge, don't forget to commit)
1390 (branch merge, don't forget to commit)
1391 $ rm -f 'printargs_merge_tool'
1391 $ rm -f 'printargs_merge_tool'
General Comments 0
You need to be logged in to leave comments. Login now