Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-tutorial.t
branchstable
changeset 770 303d27c76021
parent 769 e2a463e1e7c8
child 771 126e31c7658b 
--- 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.
evolve