I wanted collapsable files in diff view so badly, I added it even though it's beyond the scope of this script.  Hopefully this will drive Marti crazy.
Merge branch 'master' of https://github.com/joeytwiddle/code