Using BBEdit’s bbdiff with Git
Add this to your .gitconfig file:
[diff]
tool = "bbdiff"
[difftool]
prompt = false
[difftool "bbdiff"]
cmd = /usr/bin/bbdiff --wait --resume "$LOCAL" "$REMOTE"
And use Git’s difftool command:
git difftool [<path>...]
Huge thanks to Tim Gray.