test_nonascii: two unicode a's

[Aaron Bentley]

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

Alexander Belchenko wrote:
> We discuss that test_contents_merge2 should be skipped on win32 because
> diff3 on win32 change line-endings. Attached patch fix this.

Well, if typical implementations of diff3 on win32 are broken, I think
we should not permit merge-type diff3 on that platform at all.  The test
failure indicates that, on win32, --merge-type diff3 really is broken.

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

iD8DBQFEqgRR0F+nu1YWqI0RArIOAJ42+lnR75i2H0fJGPoaW3yl4w9s1wCeOh/z
l2EezwqCcxDCtwzFAlC5maQ=
=0t83
-----END PGP SIGNATURE-----