Skip to content

Instantly share code, notes, and snippets.

@ChandleWEi

ChandleWEi/gist:70c7c2eeac4e9a73fc0c

Created October 20, 2014 08:42
Show Gist options
  • Save ChandleWEi/70c7c2eeac4e9a73fc0c to your computer and use it in GitHub Desktop.
Save ChandleWEi/70c7c2eeac4e9a73fc0c to your computer and use it in GitHub Desktop.
Download ZIP
fixed Kaleidoscope plugin for Yosemite 10.10 git
Raw
gistfile1.txt
1.sudo vi /Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-difftool--helper
2.change Line 9 ". git-mergetool--lib" => ". /Applications/Xcode.app/Contents/Developer/usr/libexec/git-core/git-mergetool--lib"
3.change ~/.gitconfig file repace ksdiff path to system absolute path
[difftool "Kaleidoscope"]
cmd = /usr/local/bin/ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment