[PATCH 2 of 2] test-merge-tools: stabilize for Windows
Matt Harbison
mharbison72 at gmail.com
Tue Mar 20 21:24:28 EDT 2018
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1521594629 14400
# Tue Mar 20 21:10:29 2018 -0400
# Node ID 6bc2f1b3bc9d3fb73ffe605f9d811bd75727434e
# Parent f2b5c2b7d2e53fe7a8d3891efc5ba50d4785b61c
test-merge-tools: stabilize for Windows
See fe5c4b795999.
diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t
--- a/tests/test-merge-tools.t
+++ b/tests/test-merge-tools.t
@@ -1385,7 +1385,7 @@ Same test with experimental.mergetempdir
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'
More information about the Mercurial-devel
mailing list