Mercurial > hg
view mercurial/__init__.py @ 9709:5858117a0077
merge: supply base node to merge tools in the environment
Merge tools will be able to exploit this to correctly merge backouts.
This won't work fully, though, until issue 1327 is solved, since the
node information is not necessarily correct.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Wed, 04 Nov 2009 15:18:19 +0100 |
parents | 9117c6561b0b |
children | 4374d819ccd5 |