merge: fix test failures with new merge code on OS X

The case collision checker was missing a op entry for 'k'eep.

--HG--
branch : stable