tests/test-merge-remove.t

--- a/tests/test-merge-remove.t	Fri Aug 12 06:01:42 2016 -0700
+++ b/tests/test-merge-remove.t	Fri Aug 12 05:56:40 2016 -0700
@@ -102,7 +102,7 @@
 Those who use force will lose
 
   $ hg merge -f
-  remote changed bar which local deleted
+  other changed bar which local deleted
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
   merging foo1 and foo to foo1
   0 files updated, 1 files merged, 0 files removed, 1 files unresolved