UNPKG

179 BPlain TextView Raw
1# .gitattributes documentation: https://git-scm.com/docs/gitattributes
2
3# Resolve 3-way merge conflicts on the CHANGELOG.md file using the union strategy
4CHANGELOG.md merge=union