Diffinity is a free diff and merging tool for Windows with focus on accurate and easy to read source code diffs.