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.
requesting all changesabort: error: Connection refused255ls: copy: No such file or directoryrequesting all changesabort: HTTP Error 404: File not found255