SourceGear Support

Thank you for following up on this!

Hi Beth,

I already have 'All Controls' enabled. Additionally I have turned off the Auto Merge Conflicts Message in DiffMerge settings in a hope that the Auto Merge Results Message will not show up but this has not worked.

Ben

Beth, I created a trivial manual merge setup with 3 copies of a file where I made different changes the same line in two of them, leaving the third one as the common ancestor. In this case, I do not get the "Auto-Merge Results" dialog at all. I prefer not seeing the dialog but I cannot con...

I'm getting hit with the same frustrations. Particularly when I use diffmerge as my mergetool in git. When working through a large rebase with many conflicts I have to do a lot of mousing around which is very frustrating .

I'm on Mac OS 10.11 and DiffMerge 4.2.1