Merge pull request #3825 from CocoaPods/changelog_merging

Add a flag in the git attributes to do union merges

Merge pull request #3825 from CocoaPods/changelog_merging
Add a flag in the git attributes to do union merges
5a180bf5 · Eloy Durán · 1a528577 · 46c16c52 · 5a180bf5
Commit 5a180bf5 authored Jul 15, 2015 by Eloy Durán
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

.gitattributes .gitattributes +2 -0

No files found.
--- a/.gitattributes
+++ b/.gitattributes
+CHANGELOG.md merge=union
\ No newline at end of file