I have a new mac mini, M1 chip. When I try to resolve conflicts using diffmerge in sourcetree, diffmerge can't find the created temp files. Sourcetree creates the files, they're out there and diffm...

Recently I had a fresh install of macOS. I've installed Sourctree and diffmerge and set diffmerge as the default merge tool. For some reason everytime when I select 'Resolve Conflicts -> Open Exter...

I've been following the directions in the "blog entry by Dave" link in this answer as I'm on Windows 7 and do use SourceGear's DiffMerge tool. I've added the git\cmd directory to my PATH system var...

When I type git diff, I want to view the output with my visual diff tool of choice (SourceGear "diffmerge" on Windows). How do I configure git to do this?

So I've seen a few questions about getting DiffMerge to be the mergetool and difftool for git. Essentially it comes down to having DiffMerge (sgdm.exe) in your PATH and a .gitconfig that looks like...

I am using TFS for source control, but I want to use SourceGear DiffMerge for viewing file differences and doing merges. I found the Tools -> Options -> Source Control -> Visual Studio Team Foundat...

On OSX, I'm using diffmerge as my git diffing tool. Here is my .gitconfig: [diff] tool = diffmerge [difftool "diffmerge"] cmd = diffmerge \"$LOCAL\" \"$REMOTE\" [alias] d = difftool --no-prompt...

I've just started using Git and it's possible I've missed something obvious, but here goes: I'm using msysgit 1.6.2.2 on Windows XP While installing, I picked option 1 to "Use Git Bash only" I'...

I have configured Sourcegear DiffMerge to be my default git merge tool using the following instructions: git config --global diff.tool diffmerge git config --global difftool.diffmerge.cmd "diffmer...