--- a/tests/test-prev-next.t Mon Jul 29 13:19:48 2019 +0200
+++ b/tests/test-prev-next.t Mon Jul 29 13:19:54 2019 +0200
@@ -470,8 +470,8 @@
[255]
$ hg prev --merge --config commands.update.check=abort
file 'bar' was deleted in other [destination] but was modified in local [working copy].
- You can use (c)hanged version, (d)elete, or leave (u)nresolved.
- What do you want to do?
+ What do you want to do?
+ 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
[1] added foo