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.

#!/bin/sh

hg init
hg log
hg grep wah
hg manifest
hg verify