diff -r bf2891877378 -r 1ce131b3221e mercurial/merge.py
--- a/mercurial/merge.py	Sat Apr 19 20:12:53 2014 +0200
+++ b/mercurial/merge.py	Mon Apr 21 15:08:39 2014 -0500
@@ -353,6 +353,7 @@
         "dg": renamegetop,
         "dr": nop,
         "e": nop,
+        "k": nop,
         "f": addop, # untracked file should be kept in working directory
         "g": addop,
         "m": mergeop,