diff --git a/.config/git/config b/.config/git/config index 6eedcc0..b2609f7 100644 --- a/.config/git/config +++ b/.config/git/config @@ -26,16 +26,11 @@ autoSetupRemote = true # Diffs and Merges {{{ -[diff] - tool = Kaleidoscope [difftool] prompt = false trustExitCode = true -[merge] - tool = Kaleidoscope - [mergetool] prompt = false conflictstyle = diff3