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.
docs/evolve-faq.rst
changeset 4620 a05bfdf372fb
parent 4618 803d32f4e498
child 4621 8784dfc6537c 
--- a/docs/evolve-faq.rst	Sat Apr 27 21:27:54 2019 -0400
+++ b/docs/evolve-faq.rst	Sat Apr 27 21:41:04 2019 -0400
@@ -138,7 +138,7 @@
 You can still use rebase to move a whole segment of the changeset graph together.
 
 .. warning:: Beware that rebasing changesets already obsolete will likely result in
-             divergent versions of the changesets.
+             content-divergent versions of the changesets.
 
 Resolve history instability: ``evolve``
 ---------------------------------------
@@ -151,7 +151,7 @@
 declare it stable, in other words rebase its former descendants on its
 newest version.
 
-You can also use evolve to solve `bumped` and `divergent` changeset/
+You can also use evolve to solve `bumped` and `content-divergent` changeset/
 
 
 Fix my history afterward: ``prune -n``
evolve