aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/%HOME%
diff options
context:
space:
mode:
Diffstat (limited to '%HOME%')
-rw-r--r--%HOME%/.gitconfig6
1 files changed, 2 insertions, 4 deletions
diff --git a/%HOME%/.gitconfig b/%HOME%/.gitconfig
index 24c13cc..d68efc8 100644
--- a/%HOME%/.gitconfig
+++ b/%HOME%/.gitconfig
@@ -9,14 +9,12 @@
[merge]
tool = kdiff3
[mergetool "kdiff3"]
- trustExitCode = false
-[mergetool]
keepBackup = false
+ trustExitCode = false
[diff]
tool = kdiff3
-[difftool]
- keepBackup = false
[difftool "kdiff3"]
+ keepBackup = false
trustExitCode = false
[pull]
ff = only