--- a/tests/test-largefiles-update.t	Fri Aug 12 06:01:42 2016 -0700
+++ b/tests/test-largefiles-update.t	Fri Aug 12 05:56:40 2016 -0700
@@ -611,7 +611,7 @@
   > EOF
   rebasing 1:72518492caa6 "#1"
   rebasing 4:07d6153b5c04 "#4"
-  local [dest] changed .hglf/large1 which remote [source] deleted
+  local [dest] changed .hglf/large1 which other [source] deleted
   use (c)hanged version, (d)elete, or leave (u)nresolved? c
 
   $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]'