[Svnmerge] [PATCH] fix remaining test failures on Windows

[Hernán Martínez Foffani]

> I debated whether to submit this, because it feels kludgy.  At first I
> wondered if it were just when the tests run.  But I found that it can
> be 
> duplicated in a very simple manual svnmerge.py usage scenario on
> Windows, so anyone could get the error "Inconsistent line ending
> style". (Anyone have a guess how many svnmerge.py users there are
> under Windows? 
> We will have some here or I wouldn't have worried about it.)

We (at my company) are Windows only developers and heavy
svnmerge.py users.

Regards,
-H.