--- a/tests/test-evolve.t	Thu Aug 23 12:51:34 2012 +0200
+++ b/tests/test-evolve.t	Thu Aug 23 12:51:06 2012 +0200
@@ -526,7 +526,7 @@
   
   $ hg touch
   $ glog
-  @  9:7a2f49fdcf11@default(draft) conflict
+  @  9:*@default(draft) conflict (glob)
   |
   o  6:acb28cd497b7@default(draft) add 1
   |
@@ -540,7 +540,7 @@
   
   $ hg touch .
   $ glog
-  @  10:ce7e3d9b3afe@default(draft) conflict
+  @  10:*@default(draft) conflict (glob)
   |
   o  6:acb28cd497b7@default(draft) add 1
   |
@@ -552,4 +552,25 @@
   |/
   o  0:8685c6d34325@default(draft) add 0
   
- 
+
+Test fold
+
+  $ hg fold 6::10
+  2 changesets folded
+  $ glog
+  @  11:*@default(draft) add 1 (glob)
+  |
+  o  5:0b9e50c35132@default(draft) add 3
+  |
+  o  4:ce341209337f@default(draft) add 4
+  |
+  | o  1:73d38bb17fd7@default(draft) add 1
+  |/
+  o  0:8685c6d34325@default(draft) add 0
+  
+  $ hg log -r 11 --template '{desc}\n'
+  add 1
+  
+  ***
+  
+  conflict