String constants need attribute indicating original encoding (#1309)

* Fixed #1008. * Updated the baseline. * Merged main and resolved conflicts. * Fixed bad merge. * Removed .gitattributes union merge from #1246. This did not solve the issues with web PRs and is not behaving as expected for local merges with git.exe.
microsoft · Oct 11, 2022 · cac261e · cac261e
1 parent 3cb18db
commit cac261e
Show file tree

Hide file tree

Showing 5 changed files with 1,211 additions and 5 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,2 @@
 RecompiledIdlHeaders.zip filter=lfs diff=lfs merge=lfs -text
 Windows.Win32.winmd filter=lfs diff=lfs merge=lfs -text
-ChangesSinceLastRelease.txt merge=union