Mercurial > evolve

diff tests/test-tutorial.t @ 770:303d27c76021 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tutorial: update divergent changeset section Still not there but less fuzy.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 09 Jan 2014 21:18:41 -0800
parents e2a463e1e7c8
children 126e31c7658b
line wrap: on
line diff
--- 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.