Merging C++ and Python with Winmerge

[Lemon Merchant]

I'm currently doing a merge of Stolenray's Advanced Diplomacy mod into Better BAT AI, which has proven to be an absolute nightmare. Not because of the mods, but because of Winmerge.

I'm merging the C++ files, and it seems like after a few hundred lines, Winmerge loses the ability to match up the lines properly and they're all willy nilly, everywhere. I can see the lines go by and I know that they match, but Winmerge can't see the differences or similarities between them.

It must be a setting that I have wrong, but I can't figure it out. Would anyone using Winmerge care to share their settings (that actually work), please? Or maybe recommend something better?

This is so frustrating!

 

[Tholal]

I recommend Beyond Compare. You get a 30-day free trial which should be long enough to finish your merge.

 

[Lemon Merchant]

Thank you. I tried it and it works much better!

 

[Chazcon]

Love Beyond Compare. It can get wacky too as you move through your edits, but remember it's only trying to help Best program of this kind I've found.

 

[Lemon Merchant]

I finished the merge with Beyond Compare. Much better.

Thanks boys!

Now if I could only get rid of those pesky pointer errors...