Git: don't keep backup when using mergetool
This commit is contained in:
parent
82364ebc05
commit
9f7c3e6466
1 changed files with 1 additions and 0 deletions
|
@ -24,6 +24,7 @@
|
||||||
|
|
||||||
[mergetool "nvim-merge"]
|
[mergetool "nvim-merge"]
|
||||||
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
||||||
|
keepBackup = false
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
prompt = false
|
prompt = false
|
||||||
|
|
Loading…
Reference in a new issue