Mercurial > hg

diff tests/test-merge-criss-cross.t @ 31766:bdcaf612e75a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add globs for Windows
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 01 Apr 2017 14:48:39 -0400
parents 41f6af50c0d8
children 4441705b7111
line wrap: on
line diff
--- a/tests/test-merge-criss-cross.t	Fri Mar 24 19:19:00 2017 -0700
+++ b/tests/test-merge-criss-cross.t	Sat Apr 01 14:48:39 2017 -0400
@@ -116,11 +116,11 @@
 
   $ f --dump --recurse *
   d2: directory with 2 files
-  d2/f3:
+  d2/f3: (glob)
   >>>
   0 base
   <<<
-  d2/f4:
+  d2/f4: (glob)
   >>>
   0 base
   <<<
@@ -222,11 +222,11 @@
 
   $ f --dump --recurse *
   d2: directory with 2 files
-  d2/f3:
+  d2/f3: (glob)
   >>>
   0 base
   <<<
-  d2/f4:
+  d2/f4: (glob)
   >>>
   0 base
   <<<
@@ -308,11 +308,11 @@
 
   $ f --dump --recurse *
   d2: directory with 2 files
-  d2/f3:
+  d2/f3: (glob)
   >>>
   0 base
   <<<
-  d2/f4:
+  d2/f4: (glob)
   >>>
   0 base
   <<<