Plex-FAWE/.gitattributes

mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-03-09 20:13:49 +00:00
*.java   diff=java
#*.java merge=import-driver #TODO not implemented, I'm just using a merge tool instead
Remove auto-LF conversion from .gitattributes because it doesn't seem to work that well. 2012-10-28 12:48:52 -07:00			`*.java diff=java`
java based merging? 2019-11-19 15:10:36 +00:00			`#*.java merge=import-driver #TODO not implemented, I'm just using a merge tool instead`