Diffuse

Posted by Kyle Ferrio — 2009-11-27

After only a day of using diffuse I can see this becoming my perfered merge tool in the near future. Very promising!
Posted by Oliver Schneider — 2012-05-04

Wow, thanks a bunch folks. Where's the donate button? Any way to contribute that makes sense to you?
Posted by kudlak — 2012-04-07

great software! :)
Posted by Radim Kolar — 2011-11-06

Its really very nice and easy to use program. I used Kdiff3 and it was pain to use. This one seems to have more clever detection of changed chunks and it has far easier to use toolbar. Just add option for making files directly editable. Add to View menu 2 checkboxes. Make left/right file editable. I found handy to directly edit files during merge. It would be good if this tool can auto setup from bzr generated conflicts by scanning directory - bzr generates files on conflict XX.BASE XX.THIS XX.OTHER
Posted by German Larrain — 2011-10-14

Nice. Waiting for the directory comparison feature!
Posted by Lukas Jirkovsky — 2011-07-13

Great diff tool. I used to be a long time user of kdiff3, but since it didn't see a release for about two years I decided to replace it by something else. I have tried many diff tools but diffuse is the only one which suits my needs.

Screenshots