--- a/tests/test-tutorial.t Wed Jan 02 11:49:22 2013 +0100
+++ b/tests/test-tutorial.t Wed Jan 02 11:52:22 2013 +0100
@@ -419,13 +419,12 @@
Splitting change
------------------
-To be done (currently achieve with "two commit + debugobsolete")
+histedit or uncommit
Collapsing change
------------------
-To be done (currently achieve with "revert + debugobsolete" or "rebase --collapse")
-
+This can be done with hg fold but the tutorial part is not written yet.
@@ -763,7 +762,7 @@
Handling Conflicting amend
----------------------------------------------
-We can detect that multiple diverging//conflicting amend have been made. There
-will be a "evol-merge" command to merge conflicting amend
+We can detect that multiple diverging//conflicting amend have been made.
+hg evolve is able to solve several of them
-This command is not ready yet.
+This section need to be written