Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
windows: adjust test output in test-merge-tools.t stable
authorRaphaël Gomès <rgomes@octobus.net>
Fri, 18 Feb 2022 12:51:23 +0100
branchstable
changeset 48802 92254dcd9255
parent 48801 94635b74b18c
child 48803 60950aef856c
windows: adjust test output in test-merge-tools.t Differential Revision: https://phab.mercurial-scm.org/D12216
tests/test-merge-tools.t file | annotate | diff | comparison | revisions 
--- 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'
Mercurial