view mercurial/__init__.py @ 21167:1ce131b3221e stable

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 9117c6561b0b
children 4374d819ccd5
line wrap: on
line source