[MERGE] Detailed short status

[Aaron Bentley]

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

John Arbash Meinel wrote:

> It seemed more to me that the first column indicated the delta between
> the basis tree and the working inventory, and the second column had more
> to do with the different between the current inventory and the working tree.

No, the first column indicates versioning changes, and the second column
indicates content changes.

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

iD8DBQFFyK6y0F+nu1YWqI0RAqD7AJ928hFbnwRqfckYfPShVp3TsoUy2wCfYFyC
y5Kt1KtCkd+sirswY/Ssmww=
=aib4
-----END PGP SIGNATURE-----