Mercurial > hg-git

changeset 1103:89303af1c4aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: glob out a hint that changed in hg 4.5
author Kevin Bullock <kbullock@ringworld.org>
date Tue, 06 Feb 2018 08:37:11 -0600
parents 93cb29247d61
children e326b349eba6
files tests/test-conflict-1.t tests/test-conflict-2.t
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-conflict-1.t	Sat Feb 03 14:54:35 2018 -0600
+++ b/tests/test-conflict-1.t	Tue Feb 06 08:37:11 2018 -0600
@@ -19,7 +19,7 @@
   $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile' | sed 's/incomplete.*/failed!/'
   warning: conflicts.* (re)
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob)
 resolve using first parent
   $ echo C > afile
   $ hg resolve -m afile | egrep -v 'no more unresolved files' || true
--- a/tests/test-conflict-2.t	Sat Feb 03 14:54:35 2018 -0600
+++ b/tests/test-conflict-2.t	Tue Feb 06 08:37:11 2018 -0600
@@ -19,7 +19,7 @@
   $ hg merge -r1 2>&1 | sed 's/-C ./-C/' | egrep -v '^merging afile' | sed 's/incomplete.*/failed!/'
   warning: conflicts.* (re)
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+  use 'hg resolve' to retry unresolved file merges or 'hg *' to abandon (glob)
 resolve using second parent
   $ echo B > afile
   $ hg resolve -m afile | egrep -v 'no more unresolved files' || true