changeset 37026 | 6bc2f1b3bc9d |
parent 37002 | e349ad5cbb71 |
child 37080 | 1e30a26a65d0 |
--- 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'