test_nonascii: two unicode a's

[Alexander Belchenko]

Aaron Bentley пишет:
> 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.

I don't care.
For me it broken only for non-native text files (that use LF
line-endings). So for most typical windows user this will work OK. But
most typical windows user by default does not have diff3 at all.

--
Alexander