Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-mq-qnew.t
changeset 21267 e4f451c8c05c
parent 21266 19d6fec60b81
child 21276 25b7c760235a 
--- a/tests/test-mq-qnew.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-mq-qnew.t	Fri May 09 14:46:50 2014 -0500
@@ -158,7 +158,7 @@
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   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
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   abort: cannot manage merge changesets
   $ rm -r sandbox
 
@@ -232,7 +232,7 @@
   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
   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
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   abort: cannot manage merge changesets
   $ rm -r sandbox
mercurial