cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

repo: make changelog easier to merge

Browse Source 
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 <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2014-06-12 18:43:15 +01:00
parent d74f0cbe30
commit f928d9ce77
2 changed files with 1179 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitattributes vendored
View File

@@ -1 +1,6 @@
# dmm map merger hook
# needs additional setup, see tools/mapmerge/install.txt
*.dmm merge=merge-dmm *.dmm merge=merge-dmm
# force changelog merging to use union
html/changelog.html merge=union

1
html/changelog.html
View File

@@ -56,6 +56,7 @@ should be listed in the changelog upon commit though. Thanks. -->
<!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# --> <!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
<div class='commit sansserif'> <div class='commit sansserif'>
<h2 class='date'>23 Mai 2014</h2> <h2 class='date'>23 Mai 2014</h2>
<h3 class='author'>Hubble updated:</h3> <h3 class='author'>Hubble updated:</h3>