diff options
| author | TheSiahxyz <164138827+TheSiahxyz@users.noreply.github.com> | 2025-09-21 17:56:07 +0900 |
|---|---|---|
| committer | TheSiahxyz <164138827+TheSiahxyz@users.noreply.github.com> | 2025-09-21 17:56:07 +0900 |
| commit | 34fdf1c59ea834c8541f6bb9d382dbd75777416c (patch) | |
| tree | 4af4d1ce9dfcf86d0e40e18031c77150adf77ae9 /mac/.config/git/config | |
| parent | a0751faaf0b20d5362487f472af5220cbe9fb8b1 (diff) | |
modified git/config, modified yazi/yazi.toml
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 |