Alternatives to kdiff3 for all platforms with any license

Platforms

Desktop

Show 10 less popular platforms

kdiff3 Comments

Great - but failure on auto resolving merge conflict

Comment by Kissaki
about kdiff3 Jul 2013

I was very enthusiastic about finally having found a merge tool where I could make out which changes came in from two sides against a base version when merging.
Being able to see 3 columns of base file, remote and local changes, and the resulting file is very nice.
Unfortunately, I had to notice the auto-resolving of conflicts produces wrong results. I can thus not use it in this state for solving merge conflicts sadly.

Reply