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-collapse.t
branchstable
changeset 19956 78ab0f85e249
parent 19925 9c78ed396075
child 19986 ea81f8b2364e 
--- a/tests/test-rebase-collapse.t	Thu Oct 24 12:05:22 2013 +0800
+++ b/tests/test-rebase-collapse.t	Wed Oct 23 23:42:13 2013 +0800
@@ -226,7 +226,7 @@
   $ cd b1
 
   $ hg rebase -s 2 --collapse
-  abort: unable to collapse, there is more than one external parent
+  abort: unable to collapse on top of 7, there is more than one external parent: 1, 5
   [255]
 
 Rebase and collapse - E onto H:
mercurial