git: Fix merge tool command

This commit is contained in:
Sanchayan Maity 2021-04-28 13:29:17 +05:30
parent db6657f3ce
commit 0a220f0e8d

View file

@ -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