diff -r 94091ab9d112 -r 208ec8ca7c79 mercurial/merge.py
--- a/mercurial/merge.py	Thu Dec 04 23:08:27 2014 -0500
+++ b/mercurial/merge.py	Wed Dec 03 14:03:20 2014 -0800
@@ -427,7 +427,7 @@
                 fla = ma.flags(f)
                 nol = 'l' not in fl1 + fl2 + fla
                 if n2 == a and fl2 == fla:
-                    actions['k'].append((f, (), "keep")) # remote unchanged
+                    actions['k'].append((f, (), "remote unchanged"))
                 elif n1 == a and fl1 == fla: # local unchanged - use remote
                     if n1 == n2: # optimization: keep local content
                         actions['e'].append((f, (fl2,), "update permissions"))