Mercurial > evolve
diff tests/test-obsolete.t @ 3154:406992d0d611
evolve: rename --contentdivergent flag to --content-divergent
This makes the whole things easier to read.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 26 Oct 2017 09:02:25 +0200 |
| parents | 663dbef40f97 |
| children | e1a230cc4527 ae6fddf39933 |
line wrap: on
line diff
--- a/tests/test-obsolete.t Thu Oct 26 08:44:50 2017 +0200 +++ b/tests/test-obsolete.t Thu Oct 26 09:02:25 2017 +0200 @@ -721,7 +721,7 @@ $ hg up --hidden 2 1 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory parent is obsolete! (4538525df7e2) - (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) + (4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) $ hg export 9468a5f5d8b2 | hg import - applying patch from stdin 1 new orphan changesets