Issue merging using beyond compare
Created originally on Bitbucket by gravikovich (Gregory Ravikovich)
When using beyond compare as the merge tool (both versions 3 and 4) I get patch markup in the parent1
file
<<<<<<< local
code...
=======
code...
>>>>>>> other
code...
Started after one of the upgrades to tortoisehg, unfortunately can't pinpoint.