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

mkdir a
cd a
hg init
echo foo > b
hg add b
hg ci -m "b" -d "0 0"

chmod -w .hg

cd ..

hg clone a b

chmod +w a/.hg # let test clean up

cd b
hg verify