r870255 | rocketraman | 2008-04-02 13:48:18 +0000 (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 object. * 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> me Review by: Dustin J. Mitchell <dustin@zmanda.com>