1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
[user] email = email name = Name [core] autocrlf = "" [merge] tool = meld [mergetool] keepBackup = false [mergetool "meld"] path = /usr/bin/meld cmd = '/usr/bin/meld' --diff $BASE $LOCAL $REMOTE --output $MERGED trustExitCode = false
You can clone a snippet to your computer for local editing. Learn more.