Skip to content

Instantly share code, notes, and snippets.

@joemsak

joemsak/.gitconfig

Last active Feb 15, 2020
Embed
What would you like to do?
.gitconfig for setting VS code as the merge conflict editor
[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