eryn/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplicate difftool entry for Kaleidoscope

Browse source
This commit is contained in:
Eryn Wells 2013-03-12 11:00:44 -07:00
parent 8426c840ba
commit 27789e5f3d
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gitconfig
View file

@ -60,8 +60,6 @@
prompt = false
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true