[BUG] Merge3 reports conflicts where diff3 succeeds

[Aaron Bentley]

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

Here's a case that diff3 merges successfully, but Merge3 reports a
conflict for.

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

iD8DBQFDQWUE0F+nu1YWqI0RAihFAJ0UUJqYXhIirw56MwHhHKgiPRrUKgCeO/D/
0FR4nWkaaffQDjiugXWKTAo=
=i83I
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: blackbox.py.BASE
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20051003/44c3bd26/attachment.diff 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: blackbox.py.OTHER
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20051003/44c3bd26/attachment-0001.diff 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: blackbox.py.THIS
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20051003/44c3bd26/attachment-0002.diff