Mercurial > hg-stable

diff tests/test-rebase-collapse.t @ 19956:78ab0f85e249 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: improve error message for more than one external parent
author Mads Kiilerich <madski@unity3d.com>
date Wed, 23 Oct 2013 23:42:13 +0800
parents 9c78ed396075
children ea81f8b2364e
line wrap: on
line diff
--- 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: