Mercurial > hg

diff mercurial/merge.py @ 21764:cd3c79392056

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jun 2014 20:59:36 -0500
parents bde505f47141
children 46308fadaa15 b27c3beaaf30
line wrap: on
line diff