Set merge strategy to union for release note files (#2892)

junit-team · Apr 16, 2022 · bd339a5 · bd339a5
1 parent 42c1add
commit bd339a5
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,3 +4,4 @@
 *.key binary
 *.jar binary
 *.ttf binary
+release-notes-* merge=union