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/shhg initecho This is file a1 > ahg add ahg commit -m "commit #0" -d "0 0"touch bhg add brm bhg commit -A -m"comment #1" -d "0 0"