diff3-like program for windows?...

smartgit and kdiff3 integration...

Doing a three-way compare with Git and KDiff3...

How to use visual merging tools?...