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 @@ -1358,7 +1358,7 @@ mergemarkertemplate settings: arg: "ll:working copy" arg: "lo:" arg: "merge rev" - arg: "lb:base: /*/f~base.*" (glob) + arg: "lb:base: */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' @@ -1388,7 +1388,7 @@ mergemarkertemplate: arg: "ll:working copy: tooltmpl ef83787e2614" arg: "lo:" arg: "merge rev: tooltmpl 0185f4e0cf02" - arg: "lb:base: /*/f~base.*" (glob) + arg: "lb:base: */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'