[MERGE] updated fix for add_lines with left_matching_blocks

[Robert Collins]

Right, this test is verified to break on bzr.dev.

Thanks for catching my previous one Martin!

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mpdiff-3461.patch
Type: text/x-patch
Size: 8675 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080530/232b8ff9/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080530/232b8ff9/attachment.pgp