[MERGE] get rid of os.spawnvp() usage for external diff

[Aaron Bentley]

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

John Arbash Meinel wrote:
> How about now?

+1

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

iD8DBQFEk1pJ0F+nu1YWqI0RAqj1AJ9++IY4Hf4B/EzAV0UkyI7C7Z17WACfeqrU
POwyu1oTd7ZzYy0taQmJqFE=
=NDkz
-----END PGP SIGNATURE-----