dot/mac
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Migrate from .stow-rename to --dotfiles

Browse source
This commit is contained in:
Danielle McLean 2023-10-23 15:15:37 +11:00
parent 2cd7ee3bf7
commit f309f3a7a6
Signed by: 00dani
GPG key ID: 52C059C3B22A753E
20 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dot-config/git/tools/ksdiff Normal file
View file

@ -0,0 +1,14 @@
# vim: ft=gitconfig
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[merge]
tool = Kaleidoscope
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[mergetool]
prompt = false
[diff]
tool = Kaleidoscope