Mercurial > hg

diff mercurial/merge.py @ 16986:79902f7e27df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: convert some hghave unix-permissions to #if
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 19 Jun 2012 01:43:41 +0200
parents 98687cdddcb1
children ce7bc04d863b
line wrap: on
line diff