I prefer Kompare: http://www.kde.org/applications/development/kompare/
Unfortunately, it doesn't look like the stable version is capable of 3-way merges.
Glad to see they're working on implementing that feature, though.
Meld - a great visual diff and merge tool for linux
31–40 of 41 posts
Re: Meld - a great visual diff and merge tool for linux
#32Earlier quoted context omitted.
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.
So that isn't quite the same as Meld's left-, right- and center panels where the center is whatever output you want saved.
Re: Meld - a great visual diff and merge tool for linux
#33Meld 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...
Xmerge looks great. Too bad I'm on git.
Re: Meld - a great visual diff and merge tool for linux
#34Earlier quoted context omitted.
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.
So that isn't quite the same as Meld's left-, right- and center panels where the center is whatever output you want saved.
You could just use Diffuse's center panel as the one to merge in to and save.
But there's no way to make it the one that's saved by default. You have to select it as the one to save, and then you have to refuse in the dialog that asks whether you want to save the other two.
Re: Meld - a great visual diff and merge tool for linux
#35I love Beyond Compare: http://www.scootersoftware.com/ Even though it's commercial I gladly payed for it. It's really fast, does a great job on aligning automatically, easily lets me isolate blocks or do manual align, has rules for comparing files, and I could go on.
I loved it too. Only Windows app I miss since switching to Mac/Linux only.
Re: Meld - a great visual diff and merge tool for linux
#36Does anyone know how to install this on Mac (preferably homebrew or macports)? It's killing me not having it.
Re: Meld - a great visual diff and merge tool for linux
#37I love Beyond Compare: http://www.scootersoftware.com/ Even though it's commercial I gladly payed for it. It's really fast, does a great job on aligning automatically, easily lets me isolate blocks or do manual align, has rules for comparing files, and I could go on.
I loved it too. Only Windows app I miss since switching to Mac/Linux only.
BC version 3 now comes with Linux support in nice little deb, rpm and tarred packages.
Re: Meld - a great visual diff and merge tool for linux
#38Earlier quoted context omitted.
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...
Xmerge looks great. Too bad I'm on git.
You can always switch to Plastic!! Now it is FREE, didn't you know.
Or, as last resort: why don't you use Xmerge with Git?? :)
Re: Meld - a great visual diff and merge tool for linux
#39Meld 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.
Diffmerge from sourcegear is free and runs natively on os x (in addition to win and Linux) and does 3 panel merges, as well as folder diffs pretty well.
Re: Meld - a great visual diff and merge tool for linux
#40For Windows I found WinMerge to be quite useful: http://winmerge.org/
+1. I use WinMerge on a daily basis on my Windows development machines. It's a very complete and polished program, typically written by people who use it themselves and want their tools to be the best.
Then why does their website make it look like shareware garbage? Yellow? Ow. :(