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/.gitattributes
+++ b/.gitattributes
@ -1 +1,2 @@
 *.java   diff=java
+#*.java merge=import-driver #TODO not implemented, I'm just using a merge tool instead