blob: 4d656b1f3cfd2f19035f397425516662bae72f27 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
# This is Git's per-user configuration file.
[user]
# Please adapt and uncomment the following lines:
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'
[difftool]
prompt = false
[diff]
tool = vimdiff
|
