robdjc··on Ask HN: What's your favorite merge tool?For windows development, I like WinMerge: http://winmerge.org/