changeset 1188 | 0c879e986ce4 |
parent 1185 | cc3e68120185 |
child 1395 | 362e2c8c5677 |
--- a/tests/test-stabilize-conflict.t Sun Dec 14 12:14:45 2014 -0800 +++ b/tests/test-stabilize-conflict.t Sun Dec 14 12:19:40 2014 -0800 @@ -167,7 +167,7 @@ $ hg resolve --all -m (no more unresolved files) $ hg evolve --continue - grafting revision 5 + grafting 5:71c18f70c34f "babar count up to fifteen" $ hg resolve -l $ hg log -G @ changeset: 8:1836b91c6c1d