Set CHANGELOG.md merge style to union (#919)
This commit is contained in:
parent
91f05e940f
commit
2e0bbc091f
1 changed files with 2 additions and 0 deletions
2
.gitattributes
vendored
2
.gitattributes
vendored
|
|
@ -20,3 +20,5 @@
|
|||
*.PDF diff=astextplain
|
||||
*.rtf diff=astextplain
|
||||
*.RTF diff=astextplain
|
||||
|
||||
/CHANGELOG.md merge=union
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue