Hello Christopher,
On 2025-05-05 21:12, Christopher Guinnup wrote:
When attempting to merge UTF-16 LE files that have merge conflicts,
SVN inserts junk characters, which I suspect are merge conflict
notations in the wrong encoding.
Last time I checked subversion did not support by default t
Hi,
When attempting to merge UTF-16 LE files that have merge conflicts, SVN inserts
junk characters, which I suspect are merge conflict notations in the wrong
encoding.
This can be surprisingly subtle when merging changes to Chinese language
resources. For example, this source snippet:
ID
