blob: ff10baa47ad3b58e065ba8b4f6578ae3653316a6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
[user]
name = Miguel
email = m.i@gmx.at
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool]
prompt = true
[mergetool "vimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd w' -c '$wincmd w' -c '$wincmd J'
[diff]
tool = nvimdiff
[difftool "nvimdiff"]
cmd = "/root/nvim.appimage -d $LOCAL $REMOTE"
prompt = true
|
