summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorDavid Spruill <[email protected]>2026-01-08 17:51:47 -0500
committerGitHub <[email protected]>2026-01-08 17:51:47 -0500
commitc5fc3ca1fd0e00a7e085ef48abfeff9c0c39817e (patch)
tree0e650a0fee8027816bbea82ca1fd9b8e3e6ee24a /.gitattributes
parentf88e4fbbd4d2671e5cd77e4f60be7a235326797e (diff)
parented3dbe56378117a15105099870f2397671ad99ab (diff)
Merge branch 'develop' into user/daspr/kmodsamplefix
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index 84b1bf11..a59c7386 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -24,6 +24,10 @@
*.vcxproj text eol=crlf
*.xaml text eol=crlf
+# Declare files that are encoded in UTF-16
+*.inf text diff working-tree-encoding=UTF-16LE-BOM eol=crlf
+*.inx text diff working-tree-encoding=UTF-16LE-BOM eol=crlf
+
###############################################################################
# Set default behavior for command prompt diff.
#
@@ -32,4 +36,3 @@
# Note: This is only used by command line
###############################################################################
*.cs diff=csharp
-