[CHANGELOG] Add a flag in the git attributes to do union merges, always saving…

[CHANGELOG] Add a flag in the git attributes to do union merges, always saving both lines in the note

[CHANGELOG] Add a flag in the git attributes to do union merges, always saving…
[CHANGELOG] Add a flag in the git attributes to do union merges, always saving both lines in the note
46c16c52 · Orta Therox · 1a528577 · 46c16c52
Commit 46c16c52 authored Jul 15, 2015 by Orta Therox
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