diff -r 2be05515b142 -r 4de90774eade tests/test-evolve.t
--- a/tests/test-evolve.t	Wed Feb 01 15:32:59 2017 +0100
+++ b/tests/test-evolve.t	Wed Feb 01 15:40:51 2017 +0100
@@ -595,7 +595,7 @@
   merging 1
   warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
-  (use 'hg resolve' and 'hg graft --continue')
+  (use hg resolve and hg graft --continue)
   [255]
   $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
   7:a5bfd90a2f29 
@@ -1238,7 +1238,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
 
   $ hg evolve --rev 23 --any
   abort: cannot specify both "--rev" and "--any"
@@ -1277,7 +1276,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
 
 Check that prune respects the allowunstable option
   $ hg up -C .
@@ -1307,7 +1305,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
   $ hg up 19
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ mkcommit c5_
@@ -1331,7 +1328,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
 
 Check that fold respects the allowunstable option
   $ hg up edc3c9de504e
@@ -1349,7 +1345,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
 
   $ hg fold --exact "19 + 18"
   abort: cannot fold chain not ending with a head or with branching
@@ -1379,7 +1374,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
 
 Create a split commit
   $ printf "oo" > oo;
@@ -1416,7 +1410,6 @@
   |/
   o  18:edc3c9de504e@default(draft) a3
   |
-  ~
   $ hg evolve --rev "18::"
   move:[33] add uu
   atop:[35] _pp
@@ -1471,7 +1464,6 @@
   |/
   o  36:43c3f5ef149f@default(draft) add uu
   |
-  ~
 
   $ hg status newlyadded
   A newlyadded
@@ -1544,7 +1536,6 @@
   $ glog -r .
   @  44:41bf1183869c@default(draft) amended
   |
-  ~
 
 no new commit is created here because the date is the same
   $ HGEDITOR=cat hg metaedit
@@ -1568,7 +1559,6 @@
   |
   o  36:43c3f5ef149f@default(draft) add uu
   |
-  ~
 
 TODO: don't create a new commit in this case
   $ hg metaedit --config defaults.metaedit=