Visual Studio Code as diff and merge tool for Git

gitconfig

[diff]
	tool = vscode
	guitool = vscode

[difftool "vscode"]
	name = "VS Code"
	trustExitCode = true
	cmd = <path_to_vscode>/code.exe -n -wait -d $LOCAL $REMOTE

[merge]
	tool = vscode
	guitool = vscode

[mergetool]
	prompt = false
	keepBackup = false
	keepTemporaries = false

[mergetool "vscode"]
	name = "VS Code"
	trustExitCode = true
	cmd = <path_to_vscode>/code.exe -n -wait -m $LOCAL $REMOTE $BASE $MERGED