Mercurial > public > mercurial-scm > python-hglib

diff hglib/merge.py @ 104:6e423f7c784f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ancestor: fix incorrect reference to 'n2'
author Francisco Figueirido <francisco@giantclam.net>
date Thu, 01 Mar 2012 23:16:07 -0500
parents ebcc5d7dd528
children fe74d5599539
line wrap: on
line diff