Mercurial > evolve
diff tests/test-topic.t @ 4173:e268f7fd7839 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 12 Oct 2018 15:15:09 +0200 |
| parents | f9a850018daa 35c21ab64420 |
| children | e07e764c0f48 04aeaec6ec07 |
line wrap: on
line diff
--- a/tests/test-topic.t Fri Oct 12 15:15:07 2018 +0200 +++ b/tests/test-topic.t Fri Oct 12 15:15:09 2018 +0200 @@ -515,7 +515,7 @@ merging alpha warning: conflicts while merging alpha! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] $ hg revert -r narf alpha $ hg resolve -m alpha