TortoiseGitMerge can't apply NonANSI (e.g., UTF-8) patch
What steps will reproduce the problem?
- Create a patch containing nonANSI characters.
- "Apply unified diff" with created patch.
What is the expected output? What do you see instead?
TortoiseGitMerge can't apply NonANSI patch.
"Could not retrieve revision xxxxxxxx of the file yyy. Patching is not possible!" is displayed in the dialog.
What version of TortoiseGit and Git are you using? On what operating system?
TortoiseGitMerge 2.12.0.0 and master.
Windows 10 64bits
Please provide any additional information below.
In PatchLines.Load(sPatchFile) in CPatch::PatchFile(), PatchLines are already a wide character string. Doing more CUnicodeUtils::GetUnicode(CStringA(sPatchLine)). Therefore I thinks it is necessary to delete CUnicodeUtils::GetUnicode(CStringA(sPatchLine)).