17 lines
317 B
INI
Executable File
17 lines
317 B
INI
Executable File
[user]
|
|
name = Tristaan
|
|
email = tristan.sneider@gmail.com
|
|
|
|
[diff]
|
|
tool = nvimdiff
|
|
[difftool]
|
|
prompt = true
|
|
[difftool "nvimdiff"]
|
|
cmd = "nvim -d $LOCAL $REMOTE"
|
|
[merge]
|
|
tool = nvimdiff
|
|
[mergetool]
|
|
prompt = true
|
|
[mergetool "nvimdiff"]
|
|
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|