Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2026-06-04 01:16: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
.gitconfig
+3
View File
@@ -0,0 +1,3 @@
[merge "import-driver"]
name = Java merge driver used to resolve conflicts
driver = merge-imports.sh %O %A %B %L %P