Skip to content

Instantly share code, notes, and snippets.

@JoelRamosM

JoelRamosM/Use VS20015 mergetool in Git

Created November 16, 2016 13:24
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save JoelRamosM/193b4182fb0b09477d80c90ec2902f12 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save JoelRamosM/193b4182fb0b09477d80c90ec2902f12 to your computer and use it in GitHub Desktop.
Download ZIP
tags to put in .gitconfig to use VS mergetool on gitbash
Raw
Use VS20015 mergetool in Git
[diff]
tool = vs2015
[difftool]
prompt = true
[difftool "vs2015"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\" //t
keepbackup = false
trustexistcode = true
[merge]
tool = vs2015
[mergetool]
prompt = true
[mergetool "vs2015"]
cmd = \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
keepbackup = false
trustexistcode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment