18 lines
284 B
Plaintext
18 lines
284 B
Plaintext
[user]
|
|
name = Vasili Sviridov
|
|
email = vasili@sviridov.ca
|
|
|
|
[push]
|
|
default = simple
|
|
|
|
[core]
|
|
editor = /usr/bin/vim
|
|
[diff]
|
|
tool = bcomp
|
|
[merge]
|
|
tool = bcomp
|
|
|
|
[mergetool "bcomp"]
|
|
trustExitCode = true
|
|
cmd = bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
|