no backup files after merge
This commit is contained in:
parent
ccb88a1ece
commit
51e8fa277e
2 changed files with 2 additions and 2 deletions
|
@ -2,4 +2,3 @@
|
|||
path = dev/dotfiles/.gitconfig_includes.common
|
||||
path = dev/dotfiles/.gitconfig_includes.cygwin
|
||||
|
||||
|
||||
|
|
|
@ -11,4 +11,5 @@
|
|||
pager = cat
|
||||
[alias]
|
||||
tree = log --show-signature --color --decorate --date=short --all --graph -n 6
|
||||
|
||||
[mergetool]
|
||||
keepBackup = false
|
||||
|
|
Loading…
Reference in a new issue