Mercurial > hg

diff mercurial/ancestor.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 64911a12dc28
children baecf4e1b7d0
line wrap: on
line diff