joemsak/.gitconfig

Last active February 15, 2020 18:10

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/joemsak/f9ebb74a7726fa74b8330fda859b9759.js"></script>
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

	[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