Using P4Merge with TortoiseGit
The team I’m currently working with uses Perforce as their versioning system. Personally I prefer Git over Perforce, but Perforce has a great merging/diff tool called P4Merge. Fortunately you can install P4Merge separately without the rest of the system. I mainly use the Bash and TortoiseGit when working with GIT , this article demonstrates how to integrate P4Merge with TortoiseGit.
Add a comment