Mercurial > hg
diff tests/test-rebase-obsolete.t @ 33688:2194a8723138
evolution: rename divergent to content-divergent
Rename divergent to content-divergent in all external user-facing output. Only
update user-facing output for the moment, variables names, templates keyword
and potentially configuration would be done in later series.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D215
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 01 Aug 2017 17:58:20 +0200 |
parents | 855a1856466d |
children | 6c1a9fd8361b |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Thu Aug 03 00:45:02 2017 +0900 +++ b/tests/test-rebase-obsolete.t Tue Aug 01 17:58:20 2017 +0200 @@ -855,7 +855,7 @@ commit: (clean) update: 1 new changesets, 2 branch heads (merge) phases: 8 draft - divergent: 2 changesets + content-divergent: 2 changesets rebase --continue + skipped rev because their successors are in destination we make a change in trunk and work on conflicting changes to make rebase abort.