summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index e2b9a3b..9792355 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -32,6 +32,8 @@
[merge]
log = true
tool = vimdiff
+[mergetool]
+ keepBackup = false
[push]
autoSetupRemote = true
default = current