tests: add and remove some (glob) markers
I have no idea if these changes are reasonable, but they look like
they'd help on the Windows buildbot.
--- a/tests/test-drawdag.t Thu Aug 24 22:55:56 2017 +0530
+++ b/tests/test-drawdag.t Fri Sep 15 22:08:25 2017 -0400
@@ -261,12 +261,12 @@
a
FILE B
b
- FILE dir1/a
+ FILE dir1/a (glob)
1
2
- FILE dir1/c
+ FILE dir1/c (glob)
5
- FILE dir2/b
+ FILE dir2/b (glob)
34
- FILE dir2/c
+ FILE dir2/c (glob)
6
--- a/tests/test-lfconvert.t Thu Aug 24 22:55:56 2017 +0530
+++ b/tests/test-lfconvert.t Fri Sep 15 22:08:25 2017 -0400
@@ -128,7 +128,7 @@
$ hg merge
merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat
merging sub/normal2 and stuff/normal2 to stuff/normal2
- warning: stuff/maybelarge.dat looks like a binary file. (glob)
+ warning: stuff/maybelarge.dat looks like a binary file.
warning: conflicts while merging stuff/maybelarge.dat! (edit, then use 'hg resolve --mark')
0 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
--- a/tests/test-shelve.t Thu Aug 24 22:55:56 2017 +0530
+++ b/tests/test-shelve.t Fri Sep 15 22:08:25 2017 -0400
@@ -352,7 +352,7 @@
# Unresolved merge conflicts:
#
- # a/a
+ # a/a (glob)
#
# To mark files as resolved: hg resolve --mark FILE