[GR-44453] Do not auto-merge patch files

fangerer · fangerer · commit 5c1c6c55e3d5 · 2023-02-24T20:55:14.000Z
PullRequest: graalpython/2654
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 CHANGELOG.md merge=union
 graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/ErrorMessages.java merge=union
+graalpython/lib-graalpython/patches/**/*.patch merge=binary

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