diff options
Diffstat (limited to 'mac/.config/git/config')
| -rw-r--r-- | mac/.config/git/config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mac/.config/git/config b/mac/.config/git/config index 7dc029b..0324918 100644 --- a/mac/.config/git/config +++ b/mac/.config/git/config @@ -62,11 +62,11 @@ diffFilter = delta --color-only [merge] tool = vscode - conflictstyle = diff3 + conflictstyle = zdiff3 [mergetool] keepBackup = false [mergetool "vscode"] - cmd = code --wait $MERGED + cmd = code --wait --merge $LOCAL $REMOTE $BASE $MERGED [pager] branch = false diff = delta |