diff -r 4ab69be0ea15 -r 27b89a0957ec tests/test-copy-move-merge.t
--- a/tests/test-copy-move-merge.t	Mon Nov 30 11:17:18 2015 -0800
+++ b/tests/test-copy-move-merge.t	Mon Nov 30 13:43:55 2015 -0800
@@ -83,7 +83,7 @@
   $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True
   rebasing 2:add3f11052fa "other" (tip)
   remote changed a which local deleted
-  use (c)hanged version or leave (d)eleted? c
+  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
 
   $ cat b
   1