Justin Akehurst <justin.akehurst@isilon.com>

Found Patch
r870255 r870255

r870255 | rocketraman | 2008-04-02 08:48:18 -0500 (Wed, 02 Apr 2008)

svnmerge.py: Fix a problem with r29666 for older versions of
python that do not have the encoding attribute on the sys.stdout

* contrib/client-side/svnmerge/svnmerge.py
  (recode_stdout_to_file): Treat as a no-op when sys.stdout does not
    have the encoding attribute.

Found by: Justin Akehurst <justin.akehurst@isilon.com>
Patch by: Justin Akehurst <justin.akehurst@isilon.com>
Review by: Dustin J. Mitchell <dustin@zmanda.com>