Commit 37186c4

authored

Merge pull request #763 from Mic92/merge-union

use better merge algorithm for CHANGELOG.md

2 parents 413fcab + 6182625 commit 37186c4Copy full SHA for 37186c4

1 file changed

+1

-0

lines changed

.gitattributes

1 file changed

+1

-0

lines changed

`‎.gitattributes`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+/CHANGELOG.md merge=union`

Comments

(0)