repo: make changelog easier to merge

The changelog now uses union merges to reduce conflicts. Changed the EOL in changelog.html to CRLF to help even more. Signed-off-by: Mloc-Argent <[email protected]>
BROTEBIS · Jun 12, 2014 · 002cd97 · 002cd97
1 parent d09e783
commit 002cd97
Show file tree

Hide file tree

Showing 2 changed files with 1,832 additions and 1,828 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,6 @@
+# dmm map merger hook
+# needs additional setup, see tools/mapmerge/install.txt
 *.dmm merge=merge-dmm
 
+# force changelog merging to use union
+html/changelog.html merge=union