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/shmkdir tcd thg initecho a > ahg add ahg commit -m test -d "0 0"hg historyhg manifesthg cat ahg verify