mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
f928d9ce77
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>
7 lines
179 B
Plaintext
7 lines
179 B
Plaintext
# 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
|