When comparing Beyond Compare vs P4Merge, the Slant community recommends P4Merge for most people. In the question“What are the best diff tools for Git?” P4Merge is ranked 2nd while Beyond Compare is ranked 5th. The most important reason people chose P4Merge is:
P4Merge is free of charge.
Ranked in these QuestionsQuestion Ranking
Pro Supports comparing folders
Beyond Compare can be used to compare both files and folders.
Pro Synchronize folders
Can be used to synchronize folders. Including wildcards.
Pro Supports 3 way merge
Good overview. Clear display of changed lines (background color) and changed characters (foreground color).
Pro Has rules for adding ignore-masks and replacement rules
So parts you don't want to see in your comparision can be hidden with ignore masks. Parts that are okay to be changed can be set with change-lists so beyond compare knows what's the replacement value and skips displaying this. So you can focus on the for you important changes. For example with the ignore mask I was able to compare two logs with different timestamps but nearly same content. (beginning with timestams the first x characters adding to ignore)
Pro Supports editing files directly
Pro Customer Service is awesome and easy to work with
Pro Can compare remote directories
Beyond Compare can compare directories through FTP, SFTP. Also it can compare directories hosted on Dropbox or Amazon S3.
Pro Can be used to compare image files
This is a useful feature for game developers using Git.
Pro Works well with large files
Pro One license covers all major OS's (Linux/Windows/Mac)
P4Merge is free of charge.
Pro 3 way merge support
P4Merge presents merge information in 4 panes - BASE, LOCAL, REMOTE and MERGE_RESULT.
Pro Also has image diffing
For those who are working in both text based source code or files, as well as images, its nice to have the diff functionality of both present in the same product.
Pro Detects minimal changes without having a common ancestor
After a merge sometimes you have conflicts. You can resolve them by using a merge tool. You can run
git mergetool --tool-help to get more details about what tools are supported.
You will get an output like the following
git mergetool --tool=<tool> may be set to one of the following:
p4merge tortoisemerge vimdiff vimdiff2 vimdiff3
The following tools are valid, but not currently available:
araxis bc bc3 codecompare deltawalker diffmerge diffuse ecmerge emerge gvimdiff gvimdiff2 gvimdiff3 kdiff3 meld opendiff tkdiff winmerge xxdiff
Some of the tools listed above only work in a windowed environment. If run in a terminal-only session, they will fail.
Pro Cross-platform with a good Mac port
P4Merge works on Windows, Linux and OS X.
Con Paid proprietary software
Beyond Compare is not free, it offers different license options depending on the number of members in a team and depending on the software version.
Con Directory comparison is not supported
With P4Merge it's impossible to compare two different directories to find differences.