From 5364b3f77035028a4677273af2b3bb2ff8ef9889 Mon Sep 17 00:00:00 2001
From: Cheng <ChengSheng@fakemail.ch>
Date: Wed, 15 Jun 2022 18:11:58 +1000
Subject: [PATCH] still fighting the evil of lfs, which inserts its tentacles
 everywher

---
 .gitattributes | 55 +++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index d1a00e1..9e9a0f8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -38,32 +38,37 @@ Makefile	text eol=lf encoding=utf-8
 
 # Force binary files to be binary
 
-# Archives
-*.7z	filter=lfs diff=lfs merge=lfs -text
-*.br	filter=lfs diff=lfs merge=lfs -text
-*.gz	filter=lfs diff=lfs merge=lfs -text
-*.tar	filter=lfs diff=lfs merge=lfs -text
-*.zip	filter=lfs diff=lfs merge=lfs -text
-
-# Documents
-*.pdf	filter=lfs diff=lfs merge=lfs -text
-
-# Images
-*.gif	filter=lfs diff=lfs merge=lfs -text
-*.ico	filter=lfs diff=lfs merge=lfs -text
-*.jpg	filter=lfs diff=lfs merge=lfs -text
-*.jpeg	filter=lfs diff=lfs merge=lfs -text
-*.pdf	filter=lfs diff=lfs merge=lfs -text
-*.png	filter=lfs diff=lfs merge=lfs -text
-*.psd	filter=lfs diff=lfs merge=lfs -text
-*.webp	filter=lfs diff=lfs merge=lfs -text
-
-# Fonts
-*.woff2	filter=lfs diff=lfs merge=lfs -text
-
-# Other
-*.exe	filter=lfs diff=lfs merge=lfs -text
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs	  diff=csharp
 
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln		 merge=binary
+#*.csproj	 merge=binary
+#*.vbproj	 merge=binary
+#*.vcxproj	 merge=binary
+#*.vcproj	 merge=binary
+#*.dbproj	 merge=binary
+#*.fsproj	 merge=binary
+#*.lsproj	 merge=binary
+#*.wixproj	 merge=binary
+#*.modelproj merge=binary
+#*.sqlproj	 merge=binary
+#*.wwaproj	 merge=binary
 ###############################################################################
 # diff behavior for common document formats
 #