[MERGE] Refactor diffing

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> Cool.

So are there further changes you want?  Or else, can I get a vote?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHRmHX0F+nu1YWqI0RAqdJAJ4mQnitK446oy/iESd85j0mczvMoQCfZ3+n
2EutTbJUQJRaSTgOuM2h+aY=
=YKjd
-----END PGP SIGNATURE-----