Enable merge union strategy for CHANGELOG.md. (#5102)

Summary:
This provides a reasonable automatic merge strategy for changelog
entries. No more merge conflicts on changelog changes.

This commit is contained in:

Karsten Jeschkies

2022-01-11 22:18:54 +02:00

committed by

GitHub

parent 3091ccd3eb

commit 67a5c19b17

1 changed files with 1 additions and 0 deletions

.gitattributes

View File

				`@@ -0,0 +1 @@`
				`CHANGELOG.md merge=union`