diff -r 40795751be1c -r 5cd7d16b8733 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Sat Sep 28 12:51:03 2019 +0200
+++ b/tests/test-prev-next.t	Fri Sep 27 13:03:12 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
@@ -534,31 +534,26 @@
   adding b
   diff --git a/a b/a
   1 hunks, 1 lines changed
-  examine changes to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'a'? [Ynesfdaq?] y
   
   @@ -1,1 +1,2 @@
    firstline
   +secondline
-  record change 1/2 to 'a'?
-  (enter ? for help) [Ynesfdaq?] y
+  record change 1/2 to 'a'? [Ynesfdaq?] y
   
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] n
+  examine changes to 'b'? [Ynesfdaq?] n
   
   created new head
   continue splitting? [Ycdq?] Y
   diff --git a/b b/b
   new file mode 100644
-  examine changes to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  examine changes to 'b'? [Ynesfdaq?] y
   
   @@ -0,0 +1,1 @@
   +bbbbb
-  record this change to 'b'?
-  (enter ? for help) [Ynesfdaq?] y
+  record this change to 'b'? [Ynesfdaq?] y
   
   no more change to split
   1 new orphan changesets