tests/test-copy-move-merge.t
changeset 39285 a3fd84f4fb38
parent 39284 975d959295ef
child 42167 91a0bc50b288
--- a/tests/test-copy-move-merge.t	Sat Aug 25 21:17:34 2018 +0300
+++ b/tests/test-copy-move-merge.t	Sun Aug 26 19:14:26 2018 +0300
@@ -88,7 +88,7 @@
   > c
   > EOF
   rebasing 2:add3f11052fa "other" (tip)
-  file 'a' was deleted in other [source] but was modified in local [dest].
+  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