Non-expected conflict

[Aaron Bentley]

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

Gustavo Niemeyer wrote:
|>We're facing an unexpected conflict, which might be a bug in
|>bzr. Basically, there are two people involved: Chris and Gustavo.
|
| [...]
|
| Just got precisely the same problem twice again. :-(

I'd recommend trying weave merge.  There's a fixed version here:
http://code.aaronbentley.com/bzr/bzrrepo/bzr.weavemerge/

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

iD8DBQFEINaf0F+nu1YWqI0RAgtDAJ4qcz9AaCs3MATxxzenF36DsDMwswCfZOrx
nyKFuqt7+Kta0RmsVdKO6SY=
=Y/iO
-----END PGP SIGNATURE-----