[http] sslbackend = schannel [gpg] program = "C:/Program Files (x86)/GnuPG/bin/gpg.exe" [diff] tool = vsdiffmerge [merge] tool = vsdiffmerge [difftool "vsdiffmerge"] cmd = \"C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t keepBackup = false [mergetool "vsdiffmerge"] cmd = \"C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m keepBackup = false trustExitCode = true