aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--%HOME%/.gitconfig10
1 files changed, 1 insertions, 9 deletions
diff --git a/%HOME%/.gitconfig b/%HOME%/.gitconfig
index ec18735..4776526 100644
--- a/%HOME%/.gitconfig
+++ b/%HOME%/.gitconfig
@@ -6,16 +6,8 @@
autocrlf = false
[push]
default = current
-[merge]
- tool = kdiff3
-[mergetool "kdiff3"]
+[mergetool]
keepBackup = false
- trustExitCode = false
-[diff]
- tool = kdiff3
-[difftool "kdiff3"]
- keepBackup = false
- trustExitCode = false
[pull]
ff = only
[alias]