1. TortoiseHg
  2. TortoiseHg
  3. thg
Issue #2332 resolved

3rd party merge tool

Anonymous created an issue

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

Comments (2)

  1. Log in to comment