diff docs/concepts.rst @ 4620:a05bfdf372fb

docs: change `divergent` references to `content-divergent`

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

--- a/docs/concepts.rst	Sat Apr 27 21:27:54 2019 -0400
+++ b/docs/concepts.rst	Sat Apr 27 21:41:04 2019 -0400
@@ -92,8 +92,8 @@
 think of the traditional parent/child DAG as the first derivative of
 your source code, and the obsolescence DAG as the second derivative.)
 
-Unstable changesets (orphan, bumped, divergent)
------------------------------------------------
+Unstable changesets (orphan, bumped, content-divergent)
+-------------------------------------------------------
 
 Evolving history can introduce problems that need to be solved. For
 example, if you prune a changeset *P* but not its descendants, those
@@ -129,17 +129,17 @@
 
 The third sort of trouble is when Alice and Bob both amend the same
 changeset *C* to have different successors. When this happens, the
-successors are both called *divergent* (unless one of them is in
-public phase; only mutable changesets are divergent).
+successors are both called *content-divergent* (unless one of them is in
+public phase; only mutable changesets are content-divergent).
 
-The collective term for orphan, bumped, and divergent changeset is
+The collective term for orphan, bumped, and content-divergent changeset is
 *unstable*::
 
-  unstable = orphan ∪ bumped ∪ divergent
+  unstable = orphan ∪ bumped ∪ content-divergent
 
 It is possible for a changeset to be in any of the unstable categories
-at the same time: it might be an orphan and divergent, or bumped and
-divergent, or whatever.
+at the same time: it might be an orphan and content-divergent, or bumped and
+content-divergent, or whatever.
 
   [diagram: Venn diagram of unstable changesets, showing overlap]