[Updated] D12216: windows: adjust test output in test-merge-tools.t

[Alphare (Raphaël Gomès)]

Closed by commit rHG92254dcd9255: windows: adjust test output in test-merge-tools.t (authored by Alphare).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D12216?vs=32286&id=32288

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D12216/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D12216

AFFECTED FILES
  tests/test-merge-tools.t

CHANGE DETAILS

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
@@ -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'



To: Alphare, #hg-reviewers, indygreg
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20220227/ca52d453/attachment-0002.html>