Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
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
You can’t perform that action at this time.