tests/test-merge-remove.t

--- a/tests/test-merge-remove.t	Wed Oct 05 15:28:34 2016 +0200
+++ b/tests/test-merge-remove.t	Fri Oct 07 08:51:50 2016 -0700
@@ -102,7 +102,7 @@
 Those who use force will lose
 
   $ hg merge -f
-  other changed bar which local deleted
+  other [merge rev] changed bar which local [working copy] 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