hg

hgmerge: do not use file with markers in tools merging themselves

This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.

#!/usr/bin/env python
#
# mercurial - scalable distributed SCM
#
# Copyright 2005, 2006 Matt Mackall <[e-mail]>
#
# This software may be used and distributed according to the terms
# of the GNU General Public License, incorporated herein by reference.

from mercurial import commands

commands.run()