[MERGE] (robertc) Reconcile tweaks from the packs branch. (Robert Collins)

[Robert Collins]

Minor tweaks to reconcile.py, and the blackbox reconcile test.
-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-5bP7CJ.patch
Type: text/x-patch
Size: 4805 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070925/0ffae271/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070925/0ffae271/attachment.pgp