# 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 # Always give the following files Windows-style line endings *.dm text eol=crlf *.dmm text eol=crlf