diff options
| -rw-r--r-- | mac/.config/git/config | 4 | ||||
| -rw-r--r-- | mac/.config/yazi/yazi.toml | 1 |
2 files changed, 3 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 diff --git a/mac/.config/yazi/yazi.toml b/mac/.config/yazi/yazi.toml index 043ce96..0a6201a 100644 --- a/mac/.config/yazi/yazi.toml +++ b/mac/.config/yazi/yazi.toml @@ -52,6 +52,7 @@ extract = [ { run = 'ya pub extract --list %*', desc = "Extract here", for = "windows" }, ] play = [ + { run = 'open -a IINA "$@"', orphan = true, for = "macos" }, { run = 'mpv --force-window "$@"', orphan = true, for = "unix" }, { run = 'mpv --force-window %*', orphan = true, for = "windows" }, { run = '''mediainfo "$1"; echo "Press enter to exit"; read _''', block = true, desc = "Show media info", for = "unix" }, |