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-conflicts.t
branchstable
changeset 21947 b081decd9062
parent 21391 cb15835456cb
child 23516 328afbad6e57 
--- a/tests/test-rebase-conflicts.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-rebase-conflicts.t	Sat Jul 26 03:32:49 2014 +0200
@@ -77,7 +77,7 @@
 
   $ echo 'resolved merge' >common
   $ hg resolve -m common
-  no more unresolved files
+  (no more unresolved files)
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
mercurial