Fixed vimdiff
Signed-off-by: Marko Korhonen <marko.korhonen@reekynet.com>
This commit is contained in:
parent
092a1b0e96
commit
46a7f1ee52
1 changed files with 8 additions and 5 deletions
|
@ -5,10 +5,13 @@
|
||||||
[commit]
|
[commit]
|
||||||
signoff = true
|
signoff = true
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
[diff]
|
|
||||||
tool = vimdiff
|
|
||||||
[merge]
|
[merge]
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
conflictstyle = diff3
|
[mergetool]
|
||||||
|
prompt = true
|
||||||
[mergetool "vimdiff"]
|
[mergetool "vimdiff"]
|
||||||
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
||||||
|
[difftool]
|
||||||
|
prompt = false
|
||||||
|
[diff]
|
||||||
|
tool = vimdiff
|
||||||
|
|
Loading…
Reference in a new issue