Update vim init to lua
This commit is contained in:
committed by
Martin Pander
parent
9748f419f0
commit
ba753ce503
@ -7,7 +7,7 @@
|
||||
[merge]
|
||||
tool = nvimdiff
|
||||
[mergetool "nvimdiff"]
|
||||
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
||||
cmd = nvim -d $LOCAL $MERGED $BASE $REMOTE -c 'wincmd w' -c 'wincmd J'
|
||||
[diff]
|
||||
tool = nvimdiff
|
||||
[difftool]
|
||||
@ -30,3 +30,5 @@
|
||||
default = matching
|
||||
[init]
|
||||
templatedir = ~/.git_template
|
||||
[credential]
|
||||
helper = store
|
||||
|
||||
Reference in New Issue
Block a user