.gitattributes
aaf53ed7
 ChangeLog merge=cl-merge