Skip to content

Instantly share code, notes, and snippets.



Last active Feb 15, 2020
What would you like to do?
.gitconfig for setting VS code as the merge conflict editor
tool = vscode
[mergetool "vscode"]
cmd = code --wait $MERGED
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment