Mercurial > hg
diff tests/test-lfconvert.t @ 34198:402efa8421b8
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.
author | Augie Fackler <augie@google.com> |
---|---|
date | Fri, 15 Sep 2017 22:08:25 -0400 |
parents | 8b91a4ff23ad |
children | 1644623ab096 |
line wrap: on
line diff
--- 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