tests/test-merge-remove.t

--- a/tests/test-merge-remove.t	Mon Nov 30 11:17:18 2015 -0800
+++ b/tests/test-merge-remove.t	Mon Nov 30 13:43:55 2015 -0800
@@ -103,7 +103,7 @@
 
   $ hg merge -f
   remote changed bar which local deleted
-  use (c)hanged version or leave (d)eleted? c
+  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
   merging foo1 and foo to foo1
   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)