[MERGE] Test for correct conflicts on delete + change

[Aaron Bentley]

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

Hi John,

Here are some merge tests for you.  Let me know if they're not what you
were looking for.

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

iD8DBQFIaTL20F+nu1YWqI0RAtOSAJ47H1KGtDF3+gjfPJeemYdU/52wWACeK9+H
CoeRHSIC6FyDYhpfaxy8KEM=
=en0g
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-test-3515.patch
Type: text/x-diff
Size: 4066 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080630/7127bea6/attachment.bin