SourceGear Support

Hi, Try to open just this file, diffmerge would ask you for a second file to compare it with, which is not the intended behavior. In other words this file contains all three files for merging, together in one file, aka the conflict file, like I said save this file and open it with winmerge to see th...

Hi, At present Diffmerge cannot read conflict files so even though this feature should be trivial as it already supports 3 way merge so save this in a file and try to open it and it can't parse it, this feature is available on winmerge but winmerge doesnt work on mac so it'd be great if you folks ca...