Meld - a great visual diff and merge tool for linux • Hacker News Board

Re: Meld - a great visual diff and merge tool for linux

#11

Post by schumihan » Mon, Dec 27, 2010, 10:46 AM UTC

prog wrote: post #5

For Windows I found WinMerge to be quite useful: http://winmerge.org/

I like winmerge. Even kdiff3 is not as useful as winmerge, IMHO.

http://kdiff3.sourceforge.net/

Re: Meld - a great visual diff and merge tool for linux

#12

Post by lt » Mon, Dec 27, 2010, 10:59 AM UTC

I 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.

Re: Meld - a great visual diff and merge tool for linux

#13

Post by lelele » Mon, Dec 27, 2010, 11:28 AM UTC

aerique wrote: post #10

How does it compare to ediff? This has been my diff tool of choice lately but I'm always interested in improvements. note: I use Emacs for many other things so that specific point is not a pro or con for me.

Never understood how Emacs users manage to compare two directories. Diffing with Emacs always seemed cumbersome to me. Would you please post a video of a directories diff session of yours? Thank you.

Re: Meld - a great visual diff and merge tool for linux

#14

Post by Luyt » Mon, Dec 27, 2010, 11:33 AM UTC

prog wrote: post #5

For 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.

Re: Meld - a great visual diff and merge tool for linux

#15

Post by chanux » Mon, Dec 27, 2010, 12:01 PM UTC

Thanks HN for giving me a tool I never realized I need.

Re: Meld - a great visual diff and merge tool for linux

#16

Post by acqq » Mon, Dec 27, 2010, 1:40 PM UTC

schumihan wrote: post #11

prog wrote: post #5

For Windows I found WinMerge to be quite useful: http://winmerge.org/

I like winmerge. Even kdiff3 is not as useful as winmerge, IMHO. http://kdiff3.sourceforge.net/

Can they be even compared? KDiff3 merges based on the "common ancestor" (3 versions to the fourth) and I don't see in that feature in the screenshots of WinMerge?

Re: Meld - a great visual diff and merge tool for linux

#17

Post by qaexl » Mon, Dec 27, 2010, 2:04 PM UTC

Meld 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.

Re: Meld - a great visual diff and merge tool for linux

#18

Post by qaexl » Mon, Dec 27, 2010, 2:07 PM UTC

sqrt17 wrote: post #7

Does 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?

Re: Meld - a great visual diff and merge tool for linux

#19

Post by naish » Mon, Dec 27, 2010, 2:13 PM UTC

qaexl wrote: post #17

Meld 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.

Araxis Merge might be what you are looking for (Professional version only).

http://www.araxis.com/merge/

Unfortunately, it is not inexpensive.

Re: Meld - a great visual diff and merge tool for linux

#20

Post by amjith » Mon, Dec 27, 2010, 2:16 PM UTC

Old but still relevant: http://amjith.blogspot.com/2007/07/visual-diff-tools-in-linu...