Mercurial > hg > mercurial-crew

diff tests/test-rebase-conflicts.t @ 20545:5936058f6bad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr The debug statement is already in a 'for root in roots' so it was probably the intention to show root instead of roots. Do that.
author Mads Kiilerich <madski@unity3d.com>
date Sat, 15 Feb 2014 01:23:12 +0100
parents aa9385f983fa
children 19d6fec60b81
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t
+++ b/tests/test-rebase-conflicts.t
@@ -210,7 +210,7 @@
      summary:     added default.txt
   
   $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
-  rebase onto 2 starting from [<changectx e31216eec445>]
+  rebase onto 2 starting from e31216eec445
   rebasing: 9:e31216eec445 5/6 changesets (83.33%)
    future parents are 2 and -1
   rebase status stored