And it's so easy to install! apt-get install meld.
Meld - a great visual diff and merge tool for linux
21–30 of 41 posts
Re: Meld - a great visual diff and merge tool for linux
#22What about vimdiff, that's already installed on most (unix-based) computers?
Re: Meld - a great visual diff and merge tool for linux
#23Meld is the only tool I know of that shows a 3-panel merge. That's the killer feature for me. Now, if there were an OSX-native app that does 3-panel merges, I'd gladly switch off of Meld.
kdiff3 works on mac
Re: Meld - a great visual diff and merge tool for linux
#24I prefer Kompare: http://www.kde.org/applications/development/kompare/
Re: Meld - a great visual diff and merge tool for linux
#25Plastic SCM's diff/merge tool has a unique feature that can be useful: moved code detection.
http://www.scootersoftware.com/vbulletin/showthread.php?p=24...
It is a newer commercial product with several rough edges, but now there's a "community edition" to try out (it's possible to use just the diff/merge tool without obtaining a license key to setup the server portion):
http://codicesoftware.blogspot.com/2010/11/building-plastic-...
Re: Meld - a great visual diff and merge tool for linux
#26Meld is the only tool I know of that shows a 3-panel merge. That's the killer feature for me. Now, if there were an OSX-native app that does 3-panel merges, I'd gladly switch off of Meld.
I believe the cross-platform (so semi-native) PlasticSCM's included xmerge has what you're looking for:
http://codicesoftware.blogspot.com/2010/07/xmerge-to-merge-r...
Re: Meld - a great visual diff and merge tool for linux
#27What about vimdiff, that's already installed on most (unix-based) computers? http://andrejk.blogspot.com/2008/04/vimdiff-howto.html
Agreed. The great part about vimdiff is that you can easily use it to rapidly make changes and view the diff of them. It's essential for cleaning up changes before a commit for me.
Re: Meld - a great visual diff and merge tool for linux
#28What about vimdiff, that's already installed on most (unix-based) computers? http://andrejk.blogspot.com/2008/04/vimdiff-howto.html
vimdiff is nice, but suffers from one major deficiency. It can't do three-way diffs.
Re: Meld - a great visual diff and merge tool for linux
#29Plastic SCM's diff/merge tool has a unique feature that can be useful: moved code detection. http://www.scootersoftware.com/vbulletin/showthread.php?p=24... It is a newer commercial product with several rough edges, but now there's a "community edition" to try out (it's possible to use just the diff/merge tool without obtaining a license key to setup the server portion): http://codicesoftware.blogspot.com/2010/11/bui…
I'd try this if this was in the standard gentoo repository.
Re: Meld - a great visual diff and merge tool for linux
#30Does it support non-ASCII/non-UTF8 encodings now? meld's failure to do anything meaningful with files in other encodings (i.e., 95% of the sourcecode I have) made me go with diffuse even though meld looks slightly nicer.
Does Diffuse have three-panel merge?
Diffuse can do n-way merges. So, yes.
Unfortunately (for automation's sake), there doesn't seem to be any obvious way to specify a single default output file. So you need to manually save whichever file you merged in to, and then refuse at the prompt to save the rest.