Mercurial > evolve
diff tests/test-evolve-obshistory-content-divergent.t @ 3924:f3713d41b85b mercurial-4.5
test-compat: merge mercurial-4.6 into mercurial-4.5
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 01:58:44 +0200 |
| parents | f7afd3a158e3 |
| children | d00f0c369bc7 |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-content-divergent.t Thu Aug 02 01:57:13 2018 +0200 +++ b/tests/test-evolve-obshistory-content-divergent.t Thu Aug 02 01:58:44 2018 +0200 @@ -333,8 +333,8 @@ } ] $ hg update 471f378eab4c - abort: hidden revision '471f378eab4c' has diverged! - (use --hidden to access hidden revisions) + abort: hidden revision '471f378eab4c'! + (use --hidden to access hidden revisions; diverged) [255] $ hg update --hidden 'desc(A0)' updating to a hidden changeset 471f378eab4c