mirror of
https://gitlab.com/lunovox/minertrade.git
synced 2025-03-18 23:01:22 +00:00
16 lines
429 B
INI
16 lines
429 B
INI
# Add the following to your .gitconfig file.
|
|
[diff]
|
|
tool = meld
|
|
[difftool]
|
|
prompt = false
|
|
[difftool "meld"]
|
|
cmd = meld "$LOCAL" "$REMOTE" #
|
|
|
|
|
|
# Add the following to your .gitconfig file.
|
|
[merge]
|
|
tool = meld
|
|
[mergetool "meld"]
|
|
# Choose one of these 2 lines (not both!) explained below.
|
|
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
|
|
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
|