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-rebase-check-restore.t
changeset 21267 e4f451c8c05c
parent 21266 19d6fec60b81
child 21947 b081decd9062 
--- a/tests/test-rebase-check-restore.t	Fri Apr 18 22:19:25 2014 -0700
+++ b/tests/test-rebase-check-restore.t	Fri May 09 14:46:50 2014 -0500
@@ -76,7 +76,7 @@
   $ echo 'conflict solved' > A
   $ rm A.orig
   $ hg resolve -m A
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg rebase --continue
 
   $ hg tglog
@@ -130,7 +130,7 @@
   $ echo 'conflict solved' > A
   $ rm A.orig
   $ hg resolve -m A
-  no unresolved files; you may continue your unfinished operation
+  no more unresolved files
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
mercurial