Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-tools: stabilize for Windows
authorMatt Harbison <matt_harbison@yahoo.com>
Tue, 20 Mar 2018 21:10:29 -0400
changeset 37023 6bc2f1b3bc9d
parent 37022 f2b5c2b7d2e5
child 37024 7c18798fc24d
test-merge-tools: stabilize for Windows See fe5c4b795999.
tests/test-merge-tools.t file | annotate | diff | comparison | revisions 
--- a/tests/test-merge-tools.t	Tue Mar 20 20:33:37 2018 -0400
+++ b/tests/test-merge-tools.t	Tue Mar 20 21:10:29 2018 -0400
@@ -1385,7 +1385,7 @@
   arg: "ll:working copy"
   arg: "lo:"
   arg: "merge rev"
-  arg: "lb:base: $TESTTMP/hgmerge.*/f~base" (glob)
+  arg: "lb:base: */hgmerge.*/f~base" (glob)
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ rm -f 'printargs_merge_tool'
Mercurial