[MERGE REVIEW] fixes for cmd_diff and checkouts

[Aaron Bentley]

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

Could I get a review on this, please?

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

iD8DBQFEAwg/0F+nu1YWqI0RAuaQAJ9ty6V63fCF2YNQ3cw2Ef0/Sj1/qwCfYeP8
Pgy5vpNuDVZwmPg2kKaVI8E=
=4hrN
-----END PGP SIGNATURE-----