tests/test-copy-move-merge.t

--- a/tests/test-copy-move-merge.t	Fri Aug 12 06:01:42 2016 -0700
+++ b/tests/test-copy-move-merge.t	Fri Aug 12 05:56:40 2016 -0700
@@ -85,7 +85,7 @@
   > c
   > EOF
   rebasing 2:add3f11052fa "other" (tip)
-  remote [source] changed a which local [dest] deleted
+  other [source] changed a which local [dest] deleted
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
 
   $ cat b