4 ms·Perforce's P4Merge is already the best GUI tool for three-way merges, and works like a charm with git.by olifante 12y agoPerforce's P4Merge is already the best GUI tool for three-way merges, and works like a charm with git.