diffmerge

I am trying to configure DiffMerge as my difftool in Git but having no luck. This is the revelent section of my .gitconfig file (the other settings not shown are just for the user). [diff] tool = diffmerge [difftool "diffmerge"] cmd = \"C:\\Program Files\\SourceGear\\Common\\DiffMerge\\sgdm.exe\" \"$LOCAL\" \"$REMOTE\" Whenever I call git difftool from the powershell command line the conflicts are shown directly beneath in the powershell interface, not in diffmerge as intended. I know the settings are being picked up by git because when I inspect the global config I am given the settings from

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 "diffmerge \"\$LOCAL\" \"\$REMOTE\"" git config --global merge.tool diffmerge git config --global mergetool.diffmerge.cmd "diffmerge --merge --result=\"\$MERGED\" \"\$LOCAL\" \"\$BASE\" \"\$REMOTE\"" git config --global mergetool.diffmerge.trustexitcode false Source: http://www.andrejkoelewijn.com/wp/2010/01/08/configure-diffmerge-with-git/ However when I run git mergetool I get the following error: What

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 Foundation Server -> Configure User Tools dialog, but setting up the merge parameters is very confusing. What should those parameters be? These are the SourceGear settings that I use: C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe Compare: /t1=%6 /t2=%7 %1 %2 Merge: /m /r=%4 /t1=%7 /t2=%8 /t3=%6 /c=%9 %2 %3 %1 These are my settings. Can't remember where I got them from but I have used them in VS2010,

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'm trying to put together a wrapper script that I can use to replace the built in git diff with DiffMerge. Based on this thread on SO, I created the following batch file: @echo off REM ---- Switch forward slashes to back slashes ---- set oldW=%2 set oldW=%oldW:/=\% set newW=%5 set newW=%newW:/=\% REM ---- Launch DiffMerge ---- "C:/Programs/SourceGear/DiffMerge/DiffMerge.exe" /title1="Old Version" %oldW%