9 lines
220 B
INI
9 lines
220 B
INI
[mergetool "meld2way"]
|
|
cmd = meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
|
|
[mergetool "meld3way"]
|
|
cmd = meld --output \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
|
|
[merge]
|
|
tool = meld2way
|
|
[include]
|
|
path = ~/.gituser
|