--- a/tests/test-uncommit.t Thu Jan 11 18:07:09 2018 +0530
+++ b/tests/test-uncommit.t Mon Jan 15 19:42:44 2018 +0100
@@ -238,7 +238,6 @@
Test phase is preserved, no local changes
$ hg up -C 3 --hidden
- updating to a hidden changeset 5eb72dbe0cb4
8 files updated, 0 files merged, 1 files removed, 0 files unresolved
(leaving bookmark touncommit-bm)
working directory parent is obsolete! (5eb72dbe0cb4)
@@ -286,7 +285,6 @@
Test --all
$ hg up -C 3 --hidden
- updating to a hidden changeset 5eb72dbe0cb4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (5eb72dbe0cb4)
(5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)