tests/test-up-local-change.t
branchstable
changeset 24885 eea3977e6fca
parent 24727 5668202cfaaf
child 25125 bd625cd4e5e7
--- a/tests/test-up-local-change.t	Wed Apr 29 23:55:25 2015 -0400
+++ b/tests/test-up-local-change.t	Wed Apr 29 21:14:59 2015 -0400
@@ -55,7 +55,7 @@
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
-  launching merge tool: true $TESTTMP/r2/a * (glob)
+  launching merge tool: true *$TESTTMP/r2/a* * (glob)
   merge tool returned: 0
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg parents
@@ -78,7 +78,7 @@
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
-  launching merge tool: true $TESTTMP/r2/a * (glob)
+  launching merge tool: true *$TESTTMP/r2/a* * (glob)
   merge tool returned: 0
   0 files updated, 1 files merged, 1 files removed, 0 files unresolved
   $ hg parents
@@ -109,7 +109,7 @@
   picked tool 'true' for a (binary False symlink False)
   merging a
   my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
-  launching merge tool: true $TESTTMP/r2/a * (glob)
+  launching merge tool: true *$TESTTMP/r2/a* * (glob)
   merge tool returned: 0
   1 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg parents