[merge] fix bundles with binary files

[Alexander Belchenko]

John Arbash Meinel пишет:
> I was able to get a test to fail if I put '\r' into the contents of a
> binary file. I still don't really know why merging the .ico file worked
> for me, but not for Alexander, but I can say the attached test fails if
> you use 'string.splitlines(True)' instead of StringIO(string).readlines().

Can you close the bug report #51927?

https://launchpad.net/products/bzr/+bug/51927

--
Alexander