Git: use union merge for CHANGELOG and ErrorMessages.java

steve-s · steve-s · commit 4e6ef3167816 · 2020-08-05T16:45:23.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+CHANGELOG.md merge=union
+graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java merge=union

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+CHANGELOG.md merge=union`
	`2`	`+graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java merge=union`