diff --git a/home/.gitconfig b/home/.gitconfig index 6dd8c0d..5533aaa 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -2,7 +2,7 @@ email = lennart.alff@gmail.com name = Thies Lennart Alff [merge] - tool = vscode + tool = kdiff3 [difftool "vscode"] cmd = code --wait --diff $LOCAL $REMOTE [mergetool "vscode"]