3rd party merge tool
Created originally on Bitbucket by Anonymous
Hello!
I use p4merge merge tool from perforce and I found that even when there is no conflicts during merge, I am asked to merge files. My assumption is that this happens only for files for which default merge tool (kdiff3) reports conflicts.
Best, Dmitriy