--- a/tests/test-evolve.t Fri Aug 29 09:29:02 2014 +0200
+++ b/tests/test-evolve.t Fri Aug 29 14:26:17 2014 +0200
@@ -270,6 +270,7 @@
move:[4] another feature
atop:[6] a nifty feature
merging main-file-1
+ working directory is now at abe98aeaaa35
$ hg log
7 feature-B: another feature - test
6 feature-A: a nifty feature - test
@@ -311,6 +312,7 @@
atop:[7] another feature
computing new diff
committed as ca3b75e3e59b
+ working directory is now at ca3b75e3e59b
$ hg glog
@ 9 feature-B: bumped update to abe98aeaaa35: - test
|
@@ -369,6 +371,7 @@
move:[11] dansk 3!
atop:[14] dansk 2!
merging main-file-1
+ working directory is now at b0e2cfb8dd21
$ hg glog
@ 15 : dansk 3! - test
|
@@ -731,6 +734,7 @@
$ hg stab --any
move:[15] c
atop:[13] a
+ working directory is now at 3742bde73477
$ hg st -C --change=tip
A c
a