[merge] tool = mvim [mergetool "mvim"] cmd = mvim -d -g "$LOCAL" "$MERGED" "$REMOTE" keepBackup = false trustExitCode = false