Mercurial > evolve
diff docs/evolve-faq.rst @ 4620:a05bfdf372fb
docs: change `divergent` references to `content-divergent`
Per https://www.mercurial-scm.org/wiki/CEDVocabulary
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 27 Apr 2019 21:41:04 -0400 |
| parents | 803d32f4e498 |
| children | 8784dfc6537c |
line wrap: on
line diff
--- 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``