Change merge driver for Changelog.md to union
See bbatsov/rubocop#3594 for context on what this is and how it works
This commit is contained in:
parent
0b91b3874f
commit
de5fb378ac
1 changed files with 1 additions and 0 deletions
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Changelog.md merge=union
|
Loading…
Reference in a new issue