From 8d282b7fea54be57efa906b1ba950fbaf89080df Mon Sep 17 00:00:00 2001 From: oranges Date: Wed, 16 Dec 2015 10:40:48 +1300 Subject: [PATCH] Added git attributes --- .gitattributes | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 5aea6a693094..524f5b3553b8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,14 @@ -# dmm map merger hook -# needs additional setup, see tools/mapmerge/install.txt +* text=auto + +# dmm map merger hook +# needs additional setup, see tools/mapmerge/install.txt *.dmm merge=merge-dmm # dmi icon merger hook # needs additional setup, see tools/dmitool/merging.txt *.dmi merge=merge-dmi -# force changelog merging to use union -html/changelog.html merge=union +# force changelog merging to use union +html/changelog.html merge=union + +