tests/test-stabilize-conflict.t
changeset 3494 14cd04ff968e
parent 3472 05bd493d496d
child 3559 d166b3dc5e8a
--- a/tests/test-stabilize-conflict.t	Sun Jan 28 23:49:46 2018 +0530
+++ b/tests/test-stabilize-conflict.t	Mon Jan 29 00:09:44 2018 +0530
@@ -170,6 +170,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 4:71c18f70c34f "babar count up to fifteen"
+  working directory is now at 1836b91c6c1d
   $ hg resolve -l
   $ hg log -G
   @  changeset:   6:1836b91c6c1d