git: Fix merge tool command
This commit is contained in:
parent
db6657f3ce
commit
0a220f0e8d
|
@ -25,7 +25,7 @@
|
||||||
prompt = false
|
prompt = false
|
||||||
keepBackup = false
|
keepBackup = false
|
||||||
[mergetool "diffconflicts"]
|
[mergetool "diffconflicts"]
|
||||||
cmd = 'nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'
|
cmd = nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
|
||||||
trustExitCode = true
|
trustExitCode = true
|
||||||
[rebase]
|
[rebase]
|
||||||
autosquash = true
|
autosquash = true
|
||||||
|
|
Loading…
Reference in New Issue