diff -r 1527ec81337e -r bac4e0bc9f6a tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Fri Aug 29 09:29:02 2014 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Aug 29 14:26:17 2014 +0200
@@ -81,6 +81,7 @@
   move:[2] babar count up to fifteen
   atop:[4] babar count up to ten
   merging babar
+  working directory is now at 71c18f70c34f
   $ hg resolve -l
   $ hg log -G
   @  changeset:   5:71c18f70c34f