[BUG] when doing a bzr pull with conflicts

[Aaron Bentley]

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

James Blackwell wrote:
> (you pull until diverged,
> once diverged you merge and never pull)*

Not true.  You can pull after you're diverged, if the other branch has
merged you and you haven't committed since the revision they merged.

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

iD8DBQFDLrVu0F+nu1YWqI0RAgE8AJ9NGhRbcIdcDlubsHLcU36oOeVzuQCeOuaj
sH1ABnK3LfA1aH8jY5FAkNQ=
=bT3p
-----END PGP SIGNATURE-----