[PATCH] Updated status --short patch with tests

[Keir Mierle]

I've updated the patch I sent the other day [1] to have tests. However, I'm not
sure how to create a test harness to test the display of inner merges. From my
reading of the existing blackbox testcode, status for pending inner merges is
not tested at all. Since I copied and modified the existing status test code,
neither is my status code tested for the case of inner merges (I have 'P.
xxx at xxx.com' for pending inner merges, and 'P  xxx at xxx.com' for regular
merges.)

I'm not even sure what an inner merge is.

If someone cares to clue me in or point me to a url (neither google nor
bazaar-vcs.org search is giving me anything) I'll remedy the situation.

Thanks,
Keir

[1] http://bundlebuggy.aaronbentley.com/request/%3C20061122084700.GK4741@cs.toronto.edu%3E