bzr merge fails if deleted contents differ

[Aaron Bentley]

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

John A Meinel wrote:
> I'm running into the other problem now, though. Where a file differs
> between BASE and OTHER, but has been deleted in THIS. Can we just create
> file.BASE and file.OTHER if the directory exists?

This is now done in my bzr.24 branch.

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

iD8DBQFDPLmr0F+nu1YWqI0RAttEAJ0WMtIvdvRv/0u7MK+XdfjDsSrSHQCdGkOO
F8qDtpgM3Zzcr/rcQDlSZsE=
=H7wS
-----END PGP SIGNATURE-----