Mercurial > evolve
diff tests/test-prev-next.t @ 4886:4ab90c838772 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 05 Oct 2019 13:50:09 -0400 |
| parents | 5d50f3de4714 |
| children | 82da27321e91 |
line wrap: on
line diff
--- a/tests/test-prev-next.t Sat Oct 05 13:50:07 2019 -0400 +++ b/tests/test-prev-next.t Sat Oct 05 13:50:09 2019 -0400 @@ -469,8 +469,7 @@ (do you want --merge?) [255] $ hg prev --merge --config commands.update.check=abort - file 'bar' was deleted in other [destination] but was modified in local [working copy]. - What do you want to do? + local [working copy] changed bar which other [destination] deleted use (c)hanged version, (d)elete, or leave (u)nresolved? 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges