Mercurial > hg-stable

diff mercurial/merge.py @ 21167:1ce131b3221e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix test failures with new merge code on OS X The case collision checker was missing a op entry for 'k'eep.
author Matt Mackall <mpm@selenic.com>
date Mon, 21 Apr 2014 15:08:39 -0500
parents f4014f646f71
children 355058ad8405
line wrap: on
line diff
--- 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,