changeset 4621 | 8784dfc6537c |
parent 4620 | a05bfdf372fb |
child 4764 | 3968f6d58591 |
--- a/docs/evolve-faq.rst Sat Apr 27 21:41:04 2019 -0400 +++ b/docs/evolve-faq.rst Sat Apr 27 21:54:52 2019 -0400 @@ -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 `content-divergent` changeset/ +You can also use evolve to solve `phase-divergent` and `content-divergent` changeset/ Fix my history afterward: ``prune -n``