diff --git a/git/.gitconfig b/git/.gitconfig index 699f536..4dfbcec 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -25,7 +25,7 @@ prompt = false keepBackup = false [mergetool "diffconflicts"] - cmd = 'nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"' + cmd = nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE" trustExitCode = true [rebase] autosquash = true