changeset 2856 | f6517779a7c4 |
parent 2854 | 66796d7b5415 |
child 2858 | 4b934144ed11 |
--- a/tests/test-evolve-order.t Thu Aug 24 09:11:54 2017 +0200 +++ b/tests/test-evolve-order.t Thu Aug 24 09:12:09 2017 +0200 @@ -252,7 +252,7 @@ 1 new orphan changesets $ hg prune -s 'desc(c3part2)' 'desc(c3_)' 1 changesets pruned - 2 new divergent changesets + 2 new contentdivergent changesets $ hg up 'desc(b3prime)' 2 files updated, 0 files merged, 3 files removed, 0 files unresolved $ hg amend -m 'b3second'