Mercurial > evolve
comparison tests/test-evolve-obshistory.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 13cb0810ce22 |
comparison
equal
deleted
inserted
replaced
| 3153:544354cfc626 | 3154:406992d0d611 |
|---|---|
| 1285 (use --hidden to access hidden revisions; diverged) | 1285 (use --hidden to access hidden revisions; diverged) |
| 1286 [255] | 1286 [255] |
| 1287 $ hg update --hidden 'desc(A0)' | 1287 $ hg update --hidden 'desc(A0)' |
| 1288 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1288 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 1289 working directory parent is obsolete! (471f378eab4c) | 1289 working directory parent is obsolete! (471f378eab4c) |
| 1290 (471f378eab4c has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) | 1290 (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
| 1291 | 1291 |
| 1292 Test output with amended + folded commit | 1292 Test output with amended + folded commit |
| 1293 ======================================== | 1293 ======================================== |
| 1294 | 1294 |
| 1295 Test setup | 1295 Test setup |