1
0
Fork 0
mirror of https://github.com/tylernguyen/dotfiles.git synced 2025-02-05 01:03:15 -06:00

refactor: inherit vscode docs snippet for chezmoi

This commit is contained in:
Tyler Nguyen 2024-11-14 23:07:45 -06:00
parent e430f67d3f
commit 53b46d1d29
No known key found for this signature in database

View file

@ -7,9 +7,13 @@
args = ["--wait"] args = ["--wait"]
[diff] [diff]
command = "code" tool = default-difftool
args = ["--wait", "--diff", "$LOCAL", "$REMOTE"]
[difftool "default-difftool"]
cmd = code --wait --diff $LOCAL $REMOTE
[merge] [merge]
command = "code" tool = code
args = ["--wait", "$MERGED"]
[mergetool "code"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED