[rfc] [patch] new merge tests suggested by Aaron

[duchier at ps.uni-sb.de]

A non-text attachment was scrubbed...
Name: tests.patch
Type: text/x-patch
Size: 4443 bytes
Desc: new merge tests
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051215/724dfb5c/attachment.bin