6 Commits

Author	SHA1	Message	Date
NotMyFault	51163ffc40	Fix gitattributes ... Co-Authored-By: Octavia Togami <2093023+octylFractal@users.noreply.github.com>	2021-02-22 11:08:45 +01:00
Octavia Togami	034b910d57	Ensure CRLF stays out of the repo ... Looks like I already failed that project a little :) (cherry picked from commit 066771b2d15748edc72095b75c4626bf445266aa)	2020-08-24 12:41:26 -04:00
Jesse Boyd	1556101a98	java based merging?	2019-11-19 15:10:36 +00:00
sk89q	6b392d1609	Remove auto-LF conversion from .gitattributes because it doesn't seem to work that well.	2012-10-28 12:48:52 -07:00
sk89q	f4aaf0c881	Updated .gitattributes to force LF when committed.	2012-10-25 11:48:44 -07:00
TomyLobo	91bb159a80	Added a .gitattributes file ... This will make your diffs show method names instead of class names on the hunk headers.	2012-01-03 14:49:33 +01:00