FastAsyncWorldEdit/.gitconfig

Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-12-27 19:30:07 +01:00
[merge "import-driver"]
	name = Java merge driver used to resolve conflicts
	driver = merge-imports.sh %O %A %B %L %P
java based merging? 2019-11-19 16:10:36 +01:00			`[merge "import-driver"]`
			`name = Java merge driver used to resolve conflicts`
			`driver = merge-imports.sh %O %A %B %L %P`