diff -r 296d55def9c4 -r 4ab69be0ea15 tests/test-merge-types.t
--- a/tests/test-merge-types.t	Wed Nov 25 14:25:26 2015 -0800
+++ b/tests/test-merge-types.t	Mon Nov 30 11:17:18 2015 -0800
@@ -172,7 +172,7 @@
   (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
   picked tool ':prompt' for a (binary False symlink True changedelete False)
   no tool found to merge a
-  keep (l)ocal or take (o)ther? l
+  keep (l)ocal, take (o)ther, or leave (u)nresolved? l
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg diff --git
   diff --git a/a b/a