Mercurial > hg

diff mercurial/merge.py @ 24775:36993b52d016

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 Thu, 16 Apr 2015 17:30:01 -0500
parents a8e6897dffbe
children 51844b8b5017
line wrap: on
line diff