Mercurial > hg
changeset 48802:92254dcd9255 stable
windows: adjust test output in test-merge-tools.t
Differential Revision: https://phab.mercurial-scm.org/D12216
| author | Raphaël Gomès <rgomes@octobus.net> |
|---|---|
| date | Fri, 18 Feb 2022 12:51:23 +0100 |
| parents | 94635b74b18c |
| children | 60950aef856c |
| files | tests/test-merge-tools.t |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge-tools.t Fri Feb 18 12:51:06 2022 +0100 +++ b/tests/test-merge-tools.t Fri Feb 18 12:51:23 2022 +0100 @@ -1592,7 +1592,8 @@ arg: "ll:working copy" arg: "lo:" arg: "merge rev" - arg: "lb:common ancestor: */f~base" (glob) + arg: "lb:common ancestor*/f~base" (glob) (no-windows !) + arg: "lb:common ancestor*\f~base" (glob) (windows !) 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ rm -f 'printargs_merge_tool' @@ -1622,7 +1623,8 @@ arg: "ll:working copy: tooltmpl ef83787e2614" arg: "lo:" arg: "merge rev: tooltmpl 0185f4e0cf02" - arg: "lb:common ancestor: */f~base" (glob) + arg: "lb:common ancestor*/f~base" (glob) (no-windows !) + arg: "lb:common ancestor*\f~base" (glob) (windows !) 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ rm -f 'printargs_merge_tool'