--- a/tests/test-tutorial.t	Wed Feb 19 18:03:13 2014 -0800
+++ b/tests/test-tutorial.t	Thu Feb 20 13:32:04 2014 -0800
@@ -826,7 +826,7 @@
 Handling Divergent amend
 ----------------------------------------------
 
-We can detect that multiple diverging/conflicting amendments have been made.
+We can detect that multiple diverging amendments have been made.
 The `evolve` command can solve this situation. But all corner case are not
 handled now.