Skip to content

Instantly share code, notes, and snippets.

@bobthecow

bobthecow/untitled.txt

Created June 14, 2010 14:05
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save bobthecow/437721 to your computer and use it in GitHub Desktop.
Save bobthecow/437721 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
untitled.txt
merge.tool=chdiff
mergetool.chdiff.cmd=/usr/bin/env chdiff --wait $LOCAL $REMOTE
mergetool.chdiff.keepbackup=false
mergetool.chdiff.trustexitcode=false
diff.tool=Kaleidoscope
difftool.Kaleidoscope.cmd=ksdiff-wrapper git "$LOCAL" "$REMOTE"
difftool.prompt=false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment