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

[Aaron Bentley]

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

Aaron Bentley wrote:
> 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.

Could someone please review this?  I don't think it's a complicated or
controversial change.

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

iD8DBQFGyY3C0F+nu1YWqI0RAmTAAJ9cfsCxoMHlRjjkO+OAtZUh29XCUACcDzHD
Cvje1IXPhXUc9rq4M1/7OSI=
=NIqt
-----END PGP SIGNATURE-----