Mercurial > hg
comparison mercurial/commands.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 | 69402eb72115 |
children | 7991df9d2f20 |
comparison
equal
deleted
inserted
replaced
21166:bf2891877378 | 21167:1ce131b3221e |
---|