Skip to content

Instantly share code, notes, and snippets.

@joemsak

joemsak/.gitconfig

Last active February 15, 2020 18:10
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save joemsak/f9ebb74a7726fa74b8330fda859b9759 to your computer and use it in GitHub Desktop.
Save joemsak/f9ebb74a7726fa74b8330fda859b9759 to your computer and use it in GitHub Desktop.
Download ZIP
.gitconfig for setting VS code as the merge conflict editor
Raw
.gitconfig
[merge]
tool = vscode
[mergetool "vscode"]
cmd = code --wait $MERGED
[mergetool]
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment