Skip to content

Instantly share code, notes, and snippets.

@benwoodward

benwoodward/.gitconfig

Created November 23, 2013 18:18
Show Gist options
  • Save benwoodward/7618106 to your computer and use it in GitHub Desktop.
Save benwoodward/7618106 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
.gitconfig
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
[merge]
tool = Kaleidoscope
@adison
Copy link

adison commented Dec 17, 2013

thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment