views:

23

answers:

0

Has anyone used TortoiseSVN to merge .NET resource files (.resx) from branch to trunk?

From my experience, WinMerge fails to merge files that contain Unicode.