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.
Metadata-Version: 1.0
Name: mercurial
Version: 0.7
Summary: scalable distributed SCM
Home-page: http://selenic.com/mercurial
Author: Matt Mackall
Author-email: mpm@selenic.com
License: GNU GPL
Description: UNKNOWN
Platform: UNKNOWN