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 a > a
hg add a
hg commit -m test -d '0 0'
# Default operation
hg clone . ../b
cd ../b
cat a
hg verify
# No update
hg clone -U . ../c
cd ../c
cat a
hg verify
# Default destination
mkdir ../d
cd ../d
hg clone ../a
cd a
hg cat a