Mercurial > hg

diff mercurial/merge.py @ 25195:472a685a4961

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 Tue, 19 May 2015 07:17:57 -0500
parents 6eb4bdad198f
children 328739ea70c3
line wrap: on
line diff