My team is looking for a powerful 3D merge tool to add to our toolbox. I have identified P4Merge and DiffMerge as the best candidates for us, because they are considered the best here on SO (thanks to the SO community), and they are consistent with volume licensing.
For a final solution, I need to compare the functions of both tools. One of the differences is that, for example, DiffMerge does not display the general content of the ancestor in a three-way merge.
What are the main differences between these tools?
(Note that this question is clearly about P4Merge and DiffMerge, I know that there are other merge tools, but they are not covered here.)
source share