Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2026-06-04 09:26:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

java based merging?

Browse Source
This commit is contained in:
Jesse Boyd
2019-11-19 15:10:36 +00:00
parent 3eb77e3e8b
commit 1556101a98
7 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+1
View File
@@ -1 +1,2 @@
*.java diff=java
#*.java merge=import-driver #TODO not implemented, I'm just using a merge tool instead