[MERGE] Restore patch verification, make it work on CR, CRLF files

[Aaron Bentley]

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

Hi all,

This patch restores patch verification for merge directive 2, and makes
it work for CR and CRLF files.  My earlier difficulty seems to have come
from slapdash newline conversions in the test suite.

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

iD8DBQFGw2ek0F+nu1YWqI0RAghpAJ9veton9278koTNdD6DRNPWx5hEkgCfYWX6
CW9EQA/OF1KG+P5aQiaOdls=
=KWYi
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-hklN7y.patch
Type: text/x-patch
Size: 7795 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070815/c1606847/attachment.bin