changeset 37026:6bc2f1b3bc9d

test-merge-tools: stabilize for Windows See fe5c4b795999.
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 20 Mar 2018 21:10:29 -0400
parents f2b5c2b7d2e5
children 7c18798fc24d
files tests/test-merge-tools.t
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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'