Skip to content

Instantly share code, notes, and snippets.

@SeanSobey
Created November 6, 2017 07:43
Show Gist options
  • Save SeanSobey/d5f51af30c77deb6cb81fe99ab6295b4 to your computer and use it in GitHub Desktop.
Save SeanSobey/d5f51af30c77deb6cb81fe99ab6295b4 to your computer and use it in GitHub Desktop.
Set VSCode as git mergetool.
[merge]
tool = vscode
[mergetool "vscode"]
cmd = code --wait $MERGED
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment