[BUG] Can't commit after merging:workaround

[Aaron Bentley]

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

There is a workaround for this bug:
Martin's reweave-branches plugin can identify and recover missing file
texts, if you point it at a branch that contains the full texts.

I've pushed an updated version of this plugin to
http://panoramicfeedback.com/opensource/bzr/reweave-branches/

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

iD8DBQFDfpIG0F+nu1YWqI0RAhSnAKCF8/Y75WxgFEn9CfVjVOsfwetHcACeNWi8
H06oVX+CRvWBIz6h+7WHc0M=
=EBh8
-----END PGP SIGNATURE-----