java based merging?

2019-11-19 15:10:36 +00:00
parent 3eb77e3e8b
commit 1556101a98
7 changed files with 51 additions and 8 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -0,0 +1,3 @@
+[merge "import-driver"]
+	name = Java merge driver used to resolve conflicts
+	driver = merge-imports.sh %O %A %B %L %P