Mercurial > hg

diff mercurial/merge.py @ 25229:451df92cec49

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, 20 May 2015 15:29:32 -0500
parents 6eb4bdad198f
children 328739ea70c3
line wrap: on
line diff