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

[Alphare (Raphaël Gomès)]

Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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
Cc: mercurial-patches, mercurial-devel