* text=auto
CHANGELOG.txt merge=union