Created
July 2, 2019 20:39
-
-
Save renatoassis01/53c4e552f3aacaac53abbf6712b5da4b to your computer and use it in GitHub Desktop.
Vscode Diff and merge tools
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Add this to you gitconfig | |
# Comment: Start of "Extra Block" | |
# Comment: This is to unlock VSCode as your git diff and git merge tool | |
[merge] | |
tool = vscode | |
[mergetool "vscode"] | |
cmd = code --wait $MERGED | |
[diff] | |
tool = vscode | |
[difftool "vscode"] | |
cmd = code --wait --diff $LOCAL $REMOTE | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment