From 0a220f0e8dfd6fa2820541c524533cb90975eeec Mon Sep 17 00:00:00 2001 From: Sanchayan Maity Date: Wed, 28 Apr 2021 13:29:17 +0530 Subject: [PATCH] git: Fix merge tool command --- git/.gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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