Skip navigation

Tag Archives: git

I just installed TextWrangler (the free version of BBEdit), and am SO GLAD to kiss Aquamacs goodbye.

TextWrangler is so great, it even has a built-in diff comparison and merge tool. The REALLY cool thing is that you can use it as an external diff program with Git!

Here’s how (thanks to Jotlab’s post on How to use FileMerge with Git as a Diff Tool on OSX for giving me the idea):

~/git-twdiff.sh:

#!/bin/sh
/usr/bin/twdiff --wait "$2" "$5"

Then, just tell Git to use your script as the external diff editor:

git config --global diff.external ~/git-twdiff.sh