diff -r 44e99811bea7 -r 4764e8436b2a tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t	Sat Jul 06 19:55:29 2019 -0400
+++ b/tests/test-copy-move-merge.t	Thu Jun 20 11:40:47 2019 -0700
@@ -88,8 +88,8 @@
   > EOF
   rebasing 2:add3f11052fa "other" (tip)
   file 'a' was deleted in local [dest] but was modified in other [source].
-  What do you want to do?
-  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
+  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+  What do you want to do? c
 
   $ cat b
   1