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] 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