12345678910111213141516171819202122 |
- [core]
- repositoryformatversion = 0
- filemode = false
- bare = false
- logallrefupdates = true
- symlinks = false
- ignorecase = true
- [diff]
- tool = vsdiffmerge
- [difftool]
- prompt = true
- [difftool "vsdiffmerge"]
- cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Professional\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
- keepBackup = false
- [merge]
- tool = vsdiffmerge
- [mergetool]
- prompt = true
- [mergetool "vsdiffmerge"]
- cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Professional\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
- keepBackup = false
- trustExitCode = true
|