Mercurial > evolve
diff tests/test-evolve-list.t @ 2856:f6517779a7c4
warning: rename warning message
divergent has been renamed into contentdivergent. Use their renamed
counterpart in warning message for new unstable changesets.
Renaming done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 24 Aug 2017 09:12:09 +0200 |
| parents | 1db0137297f4 |
| children | 4b934144ed11 |
line wrap: on
line diff
--- a/tests/test-evolve-list.t Thu Aug 24 09:11:54 2017 +0200 +++ b/tests/test-evolve-list.t Thu Aug 24 09:12:09 2017 +0200 @@ -64,7 +64,7 @@ rebasing 1:d2ae7f538514 "b" $ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True rebasing 1:d2ae7f538514 "b" - 2 new divergent changesets + 2 new contentdivergent changesets $ hg evolve --list c882616e9d84: b divergent: a922b3733e98 (draft) (precursor d2ae7f538514)