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
touch unknown
touch a
hg add a
hg ci -m "1" -d "0 0"
touch b
hg add b
hg ci -m "2" -d "0 0"
echo %% Should show unknown
hg status
hg revert -r 0
echo %% Should show unknown and b removed
hg status
echo %% Should show a and unknown
ls