3 ms·P4merge is my go-to tool for diffs and merges.by secondcoming 6y agoP4merge is my go-to tool for diffs and merges.