27 lines
463 B
Plaintext
27 lines
463 B
Plaintext
[user]
|
|
name = Vasili Svirydau
|
|
email = vsvirydau@copperleaf.com
|
|
|
|
[push]
|
|
default = simple
|
|
|
|
[core]
|
|
editor = /usr/bin/vim
|
|
|
|
[merge]
|
|
tool = bcompare
|
|
|
|
[diff]
|
|
tool = bcompare
|
|
|
|
[mergetool "bcompare"]
|
|
trustExitCode = true
|
|
cmd = bcompare "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
|
|
|
|
[mergetool "meld"]
|
|
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
|
|
|
|
[difftool "bcompare"]
|
|
trustExitCode = true
|
|
cmd = bcompare "$LOCAL" "$REMOTE"
|