summaryrefslogtreecommitdiff
path: root/dotfiles
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2020-11-11 16:05:29 +0100
committerAnton Khirnov <anton@khirnov.net>2020-11-11 16:05:29 +0100
commitb53f2b2b9a3a78bb46e314f8db4e40d2f0b790f6 (patch)
tree52c2f83e90cd4e0beaca000545c4f3f7733cf78a /dotfiles
parent123404970e4496107d026ae2f52f644a24711e98 (diff)
gitconfig: mergetool.keepBackup = false
Diffstat (limited to 'dotfiles')
-rw-r--r--dotfiles/gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index ed98abc..d3a0cd3 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -8,6 +8,8 @@
confirm = always
[merge]
tool = vimdiff
+[mergetool]
+ keepBackup = false
[core]
pager = less -FRX
[alias]