Mercurial > evolve
diff tests/test-evolve-templates.t @ 4224:12b026c49fdf mercurial-4.7
test-compat: merge stable into mercurial-4.7
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 09 Nov 2018 20:18:55 +0100 |
parents | f555039d1a08 |
children | 2a7f89817540 2cbb9914d227 |
line wrap: on
line diff
--- a/tests/test-evolve-templates.t Wed Nov 07 19:35:48 2018 +0100 +++ b/tests/test-evolve-templates.t Fri Nov 09 20:18:55 2018 +0100 @@ -1004,7 +1004,7 @@ added 1 changesets with 0 changes to 1 files (+1 heads) 2 new obsolescence markers obsoleted 1 changesets - new changesets 7a230b46bf61 (1 drafts) + new changesets 7a230b46bf61 (run 'hg heads' to see heads, 'hg merge' to merge) working directory parent is obsolete! (471f378eab4c) (use 'hg evolve' to update to its successor: 7a230b46bf61)