Mercurial > public > mercurial-scm > python-hglib

diff hglib/merge.py @ 109:9324a89dd84e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client: Be more permissive on the output of update (issue3892) Some extensions can add lines to the output, we now ignore them
author Benoit Allard <benoit@aeteurope.nl>
date Tue, 23 Apr 2013 22:11:26 +0200
parents ebcc5d7dd528
children fe74d5599539
line wrap: on
line diff