Perforce P4Merge is a great free diff and 3-way merge tool that has a very good visualization of differences and conflicts. In this post I’ll show how to integrate it into the popular clients of version control systems and to the Visual Studio.Read More →