- Mar 26, 2018
-
-
Richard Clamp authored
https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge In fee58e6556bd6d7e700347f92a42693af87a687e the file was renamed from CHANGELOG -> CHANGELOG.md and later converted to markdown. Here we update the .gitattributes to reflect the rename, as merge=union will probably reduce some of the rebase conflicts in CHANGELOG.md
-
- Aug 01, 2016
-
-
Gabriel Mazetto authored
-
- Jun 12, 2015
-
-
Marin Jankovski authored
-