Resolve Conflicts with df error

I use Subversion 1.5.3, Server and Client both Windows Xp.
And My OS language is Chinese.

When I updated, I get a conflicts. And I use 'df' command to
see the diff. But I get the outputs:

svn: Valid UTF-8 data
(hex: 65 78 74 2d 62 61 73 65 2f 61 2e 74 78 74 2e 73 76 6e 2d 62 61 73 65
09)
followed by invalid UTF-8 sequence
(hex: d0 c7 c6 da)

I checked the error hex 'd0 c7 c6 da', It is Chinese characters 'ÐÇÆÚ'( means
week)
with the encoding GBK(Chinese Encoding).

I think the real results should contains time like below,

--- .svn/text-base/sandwich.txt.svn-base Tue Dec 11 21:33:57 2007

I think we can just use 2008.12.11 21:22:58, the multi-byte time
strings lead to
many errors. Not just here.

-- 
My Blog: http://rocksun.cn/
My Site: http://www.subversion.org.cn