summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 09d3d34..ec84dae 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,3 +7,5 @@
tool = meld
[rerere]
enabled = true
+[mergetool]
+ keepBackup = false