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!
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!