Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated KDiff3 #4

Open
abheekda1 opened this issue Mar 21, 2022 · 0 comments
Open

Updated KDiff3 #4

abheekda1 opened this issue Mar 21, 2022 · 0 comments

Comments

@abheekda1
Copy link

abheekda1 commented Mar 21, 2022 •
edited
Loading

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@abheekda1