Mercurial > evolve
diff tests/test-uncommit.t @ 3410:39112fd4d5ed stable
branching: backed out test output changes from core-02fdb8c018aa
This backs out evolve-1905aac253f0.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 15 Jan 2018 19:42:44 +0100 |
| parents | eacf6149b678 |
| children | e1f3e43a50a4 |
line wrap: on
line diff
--- 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)