Rooba
/
ReC98
mirror of https://github.com/nmlgc/ReC98.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
ReC98/.gitattributes

6 lines
105 B
Plaintext
Raw Normal View History

[Maintenance] Remove merge=union from .gitattributes What the…? *That's* what's been messing up merge conflicts all the time? Part of P0032, funded by zorg.
2019-09-20 19:38:08 +00:00
*.asm text eol=crlf
[Maintenance] Commit .bat files with LF line endings, but check out as CRLF Windows 9x requires CRLF for batch files to work at all. While Windows XP and later appear to work with LF line endings, they introduce devious glitches with certain commands: https://www.dostips.com/forum/viewtopic.php?t=8988 However, we still want to use LF endings in the repo to prevent the annoying ^M whitespace errors. Part of P0002, funded by GhostPhanom.
2024-06-15 04:12:08 +00:00
*.bat text eol=crlf
[Maintenance] Change line endings in old C/C++ files to LF Yup, even a DOS compiler from 1994 considered CRLF line endings as stupid. Part of P0172, funded by [Anonymous] and Blue Bolt.
2021-12-25 15:18:17 +00:00
*.[ch]* text eol=lf
[Maintenance] Change Makefile line endings to LF Part of P0229, funded by Ember2528.
2023-02-22 22:50:37 +00:00
*.mak text eol=lf
[th04/th05] Rebuild ZUN.COM
2018-04-15 14:37:06 +00:00
zuncom/zun*.txt -text