svnmerge.py: Similar to r29741, fix brokenness with r29666 when there is no  default locale for sys.stdout.encoding in Python.
svnmerge.py: Similar to r29741, fix brokenness with r29666 when there is no 
default locale for sys.stdout.encoding in Python.

* contrib/client-side/svnmerge/svnmerge.py
  (recode_stdout_to_file): Treat as a no-op when sys.stdout.encoding returns
  None.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@869928 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion