2019-10-26 20:05:31 +03:00
|
|
|
[user]
|
|
|
|
|
email = marko.korhonen@reekynet.com
|
|
|
|
|
name = Marko Korhonen
|
|
|
|
|
signingkey = C514037F1EFF4FA6
|
|
|
|
|
[commit]
|
|
|
|
|
signoff = true
|
|
|
|
|
gpgsign = true
|
2019-10-27 22:43:52 +02:00
|
|
|
[diff]
|
|
|
|
|
tool = vimdiff
|
|
|
|
|
[merge]
|
|
|
|
|
tool = vimdiff
|
|
|
|
|
conflictstyle = diff3
|
|
|
|
|
[mergetool "vimdiff"]
|
|
|
|
|
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
