From 2eca4d4397247f8553a0e5f49b130e8cadbe96ba Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Wed, 29 Jan 2020 16:01:21 +0800
Subject: [PATCH 1/2] Create .gitattributes

---
 .gitattributes | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..a0a624af
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+# merger hooks, run tools/hooks/install.bat or install.sh to set up
+*.dmm merge=dmm
+*.dmi merge=dmi
+
+# force changelog merging to use union
+html/changelog.html merge=union
+
+# force all files to be LF 
+* text=auto

From 97c630e702d9c86c4b6f9c27a83406f4c455818a Mon Sep 17 00:00:00 2001
From: Letter N <24603524+LetterN@users.noreply.github.com>
Date: Wed, 29 Jan 2020 16:03:26 +0800
Subject: [PATCH 2/2] Update .editorconfig

---
 .editorconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index a25dbdfc..13dcd5e0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,3 +2,10 @@
 insert_final_newline = true
 indent_style = tab
 indent_size = 4
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.txt]
+insert_final_newline = false