Mercurial > hg

diff mercurial/merge.py @ 12397:3b8ced3e3bbf stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-gendoc: mute gendoc stderr Solaris had problems with zh_CN and warned "couldn't set locale correctly" on stderr. We don't care.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 24 Sep 2010 02:57:15 +0200
parents fad5ed0ff997
children ce818cf215dc
line wrap: on
line diff