Comment on Meld - a great visual diff and merge tool for linuxComments−angusgr15yOne thing Meld cannot easily do (unless it's changed very recently) is manually align blocks of text when autoalignment fails.I recommend Diffuse for that, and also for three-way merging: http://diffuse.sourceforge.net/I do join in recommending Meld for your everyday diff/merge, though. :)
Comments
One thing Meld cannot easily do (unless it's changed very recently) is manually align blocks of text when autoalignment fails.
I recommend Diffuse for that, and also for three-way merging: http://diffuse.sourceforge.net/
I do join in recommending Meld for your everyday diff/merge, though. :)