FastAsyncWorldEdit/.gitattributes

Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-10 05:20:04 +01: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 20:48:52 +01:00			`*.java diff=java`
java based merging? 2019-11-19 16:10:36 +01:00			`#*.java merge=import-driver #TODO not implemented, I'm just using a merge tool instead`