diff docs/user-guide.rst @ 4621:8784dfc6537c

docs: change `bumped` references to `phase-divergent`

Per https://www.mercurial-scm.org/wiki/CEDVocabulary

--- a/docs/user-guide.rst	Sat Apr 27 21:41:04 2019 -0400
+++ b/docs/user-guide.rst	Sat Apr 27 21:54:52 2019 -0400
@@ -357,7 +357,7 @@
 
 (Incidentally, there are two other types of instability that changesets
 can get into with ``evolve``: they may be *content-divergent* or
-*bumped*. Both of those states are more likely to occur when
+*phase-divergent*. Both of those states are more likely to occur when
 `sharing mutable history`_, so we won't cover them in this user guide.)
 
 .. _`sharing mutable history`: sharing.html