Skip to content

Instantly share code, notes, and snippets.

@jjhidalgar

jjhidalgar/vscode_git_mergetool.txt

Created December 1, 2018 23:49
Show Gist options
  • Save jjhidalgar/cdc70b879434fc561cf9cb9dfba9403d to your computer and use it in GitHub Desktop.
Save jjhidalgar/cdc70b879434fc561cf9cb9dfba9403d to your computer and use it in GitHub Desktop.
Download ZIP
VScode for git mergetool
Raw
vscode_git_mergetool.txt
git config --global --edit
[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