# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1389331121 28800
# Node ID 303d27c7602147d822d754f0d94e2989484bb57b
# Parent  e2a463e1e7c89787a77ca422e9ea83c80cda68e8
tutorial: update divergent changeset section

Still not there but less fuzy.

diff -r e2a463e1e7c8 -r 303d27c76021 tests/test-tutorial.t
--- a/tests/test-tutorial.t	Thu Jan 09 21:10:42 2014 -0800
+++ b/tests/test-tutorial.t	Thu Jan 09 21:18:41 2014 -0800
@@ -822,10 +822,11 @@
   
 
 
-Handling Conflicting amend
+Handling Divergent amend
 ----------------------------------------------
 
-We can detect that multiple diverging/conflicting amendments have been made. There
-will be a "evol-merge" command to merge conflicting amendments.
+We can detect that multiple diverging/conflicting amendments have been made.
+The `evolve` command can solve this situation. But all corner case are not
+handled now.
 
 This section needs to be written.