The latest KDiff3 can theoretically be used with this script merger, more testing is needed but I have done some basic tests and it seems fine, with the only difference being that there are .orig files left over after manual merges, which won't impact the game at all and should be easily fixed.
The latest windows standalone builds can be hard to find, so I'll link them here. Extract and copy all the files from inside bin to the KDiff3 folder under Tools.
Note: they are official, it's just that the non-buildbot releases are the ones they link in their Gitlab repo. This link can be found on the official KDiff3 section of the KDE website.
The latest KDiff3 can theoretically be used with this script merger, more testing is needed but I have done some basic tests and it seems fine, with the only difference being that there are
.origfiles left over after manual merges, which won't impact the game at all and should be easily fixed.The latest windows standalone builds can be hard to find, so I'll link them here. Extract and copy all the files from inside
binto the KDiff3 folder under Tools.