Mercurial > hg > hg-git

changeset 754:5e2f63e1064c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: adapt for hg 3.1 output changes
author Augie Fackler <raf@durin42.com>
date Sat, 23 Aug 2014 13:05:28 -0400
parents 1d94f54b3502
children 13d42d321c24
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
+++ b/tests/test-conflict-1.t
@@ -23,7 +23,7 @@
   use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 resolve using first parent
   $ echo C > afile
-  $ hg resolve -m afile | egrep -v '^no more unresolved files$' || true
+  $ hg resolve -m afile | egrep -v 'no more unresolved files' || true
   $ hg ci -m "merge to C"
 
   $ hg log --graph --style compact | sed 's/\[.*\]//g'
--- a/tests/test-conflict-2.t
+++ b/tests/test-conflict-2.t
@@ -23,7 +23,7 @@
   use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 resolve using second parent
   $ echo B > afile
-  $ hg resolve -m afile | egrep -v '^no more unresolved files$' || true
+  $ hg resolve -m afile | egrep -v 'no more unresolved files' || true
   $ hg ci -m "merge to B"
 
   $ hg log --graph --style compact | sed 's/\[.*\]//g'