Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Select an option

  • Save alkampfergit/46883dcef9fb4bee39a56ce0e69dcf24 to your computer and use it in GitHub Desktop.

Select an option

Save alkampfergit/46883dcef9fb4bee39a56ce0e69dcf24 to your computer and use it in GitHub Desktop.
[diff]
tool = vsdiffmerge
[difftool]
prompt = true
[difftool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsDiffMerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
keepbackup = false
trustexistcode = true
[merge]
tool = vsdiffmerge
[mergetool]
prompt = true
[mergetool "vsdiffmerge"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\IDE\\CommonExtensions\\Microsoft\\TeamFoundation\\Team Explorer\\vsDiffMerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
keepbackup = false
trustexistcode = true
@MouthOfMadness
Copy link
Copy Markdown

Is there any way to place these settings globally rather per repository?

@alkampfergit
Copy link
Copy Markdown
Author

alkampfergit commented Jul 21, 2019 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment