[Svnmerge] Revision 29835 of svnmerge.py does not work in our script.

[Raman Gupta]

Piet-Hein Peeters wrote:
> Hello,
> 
> I've upgraded to the latest version of svnmerge.py (revision 29835), but
> that version does not work in our script. Revision 28275 did and does work.
> We call svnmerge.py as follows:

Looks like whatever platform you're on is returning None for
sys.stdout.encoding. I just committed a change to ignore the recode in
this case, so try the latest version.

Cheers,
Raman Gupta