Ask HN: What's your favorite merge tool? 14 years agoFor windows development, I like WinMerge: http://winmerge.org/ 0ThreadHN