Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 09:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
main
Plex-FAWE/.gitconfig

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

3 lines
117 B
INI
Raw Permalink Normal View History

java based merging?
2019-11-19 15:10:36 +00:00
[merge "import-driver"]
name = Java merge driver used to resolve conflicts
driver = merge-imports.sh %O %A %B %L %P
Reference in New Issue Copy Permalink