mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 15:11:51 +02:00
19 lines
455 B
INI
19 lines
455 B
INI
[core]
|
|
whitespace = blank-at-eol,blank-at-eof,space-before-tab
|
|
autocrlf = input
|
|
[apply]
|
|
whitespace = fix
|
|
|
|
[diff]
|
|
tool = meld
|
|
[difftool]
|
|
prompt = false
|
|
[difftool "meld"]
|
|
cmd = meld "$LOCAL" "$REMOTE"
|
|
[merge]
|
|
tool = meld
|
|
[mergetool "meld"]
|
|
# Choose one of these two lines (not both!) explained below.
|
|
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
|
|
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
|