Code Compare File SVN Conflicts

[bentriplett]

I really like the file comparison aspects of Code Compare but when editing the conflicts in a source file Code Compare shows the >>>>>.mine etc symbols making it totally useless. Manual merging of these lines is slow and painful.

I would gladly pay for Code Compare if it had proper conflict editing.

[AlexeyN]

Please, vote for this idea at UserVoice. If it receives enough votes, we will implement it in one of the next versions:

http://devart.uservoice.com/forums/9303 ... -such-as-w