News for hackers. Stuff that matters.

Ask HN: What's your favorite merge tool?

Seems to be quite a few options out there, and I was wondering what the crowd favorite was. There didn't seem to be a thread on this, so it might be nice to collect everyone's opinion in one place.
( 5 comments | 4 points | on HN )
Re:Ask HN: What's your favorite merge tool? by robdjc on Saturday January 05, 2013 @03:34PM (#5013943)
For windows development, I like WinMerge: http://winmerge.org/
Re:Ask HN: What's your favorite merge tool? by jbicha on Friday January 04, 2013 @11:25PM (#5011590)
Re:Ask HN: What's your favorite merge tool? by surajcm on Saturday January 05, 2013 @08:29AM (#5012559)
diffmerge
Re:Ask HN: What's your favorite merge tool? by jyu on Friday January 04, 2013 @01:41PM (#5009022)
p4merge
Re:Ask HN: What's your favorite merge tool? by gruseom on Friday January 04, 2013 @05:06PM (#5010249)
ediff