view tests/test-merge5.out @ 1798:d610fe0e6893

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.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)