changeset 20545 | 5936058f6bad |
parent 20117 | aa9385f983fa |
child 21266 | 19d6fec60b81 |
--- a/tests/test-rebase-conflicts.t Wed Feb 12 23:44:30 2014 +0100 +++ b/tests/test-rebase-conflicts.t Sat Feb 15 01:23:12 2014 +0100 @@ -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