[prog]

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

[Luyt]

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

[alnayyir]

Then why does their website make it look like shareware garbage? Yellow? Ow. :(

[schumihan]

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

http://kdiff3.sourceforge.net/

[acqq]

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?

[schumihan]

Most of the time, I use both as a tool to do visual diff, instead of code merge.

KDiff3 is not so good as winmerge as visual diff tool. And kdiff3 UI has small problem on Ubuntu, as it was not developed for gnome environment.