Diff and merging tool with focus on accurate and easy to read source code diffs.