4 ms·

Winmerge for 2-way and kdiff3 for 3-way although I'm trialing meld now there's an official windows installer.