bzr merge broken?

[Aaron Bentley]

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

Valentino Volonghi aka Dialtone wrote:
> Hi all, from a first try with bzr I tried branching locally and then merging
> back after 2 commits. This unfortunately failed because of some error in the
> command handling in bzr. I'm using latest bzr.dev

Thanks for your report.

Fixes for that have already been created.  They're in
http://panoramicfeedback.com/opensource/bzr/bzr.ab and will enter the
mainline very soon.

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

iD8DBQFDVm+50F+nu1YWqI0RAifGAJ4vu3n2eyvmWVyustIac5lAMMMDzgCdGgoD
YDO3mBXgcQLxarX966gzzNU=
=mUdy
-----END PGP SIGNATURE-----