Files · 5a180bf5ac0aa492e1957b16282bd2c755d0f308 · gengmeiios / cocoapods · GitLab

History Find file

[CHANGELOG] Add a flag in the git attributes to do union merges, always saving… · 46c16c52
Orta Therox authored Jul 15, 2015
```
[CHANGELOG] Add a flag in the git attributes to do union merges, always saving both lines in the note
```
46c16c52

Name	Last commit	Last update
bin		Loading commit data...
examples		Loading commit data...
lib		Loading commit data...
spec		Loading commit data...
.gitattributes		Loading commit data...
.gitignore		Loading commit data...
.gitmodules		Loading commit data...
.kick		Loading commit data...
.rubocop.yml		Loading commit data...
.rubocop_cocoapods.yml		Loading commit data...
.rubocop_todo.yml		Loading commit data...
.travis.yml		Loading commit data...
.yardopts		Loading commit data...
CHANGELOG.md		Loading commit data...
CODE_OF_CONDUCT.md		Loading commit data...
CONTRIBUTING.md		Loading commit data...
Gemfile		Loading commit data...
Gemfile.lock		Loading commit data...
LICENSE		Loading commit data...
README.md		Loading commit data...
Rakefile		Loading commit data...
cocoapods.gemspec		Loading commit data...