Mercurial > hg

diff mercurial/merge.py @ 10103:37679dbf2ee3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hook: fix bug (reuse of variable) introduced in 872d49dd577a For binary installs, the 'name' argument would be reused as a local variable, destroying its original value. The patch fixes that, and also avoids copying sys.path when it's not necessary.
author Sune Foldager <cryo@cyanite.org>
date Mon, 21 Dec 2009 16:12:43 +0100
parents ee00ef6f9be7
children 25e572394f5c
line wrap: on
line diff