Commit 3be082a

committed

Make it easier to deal with changelog conflicts

See https://medium.com/@nettsundere/on-reducing-changelog-merge-conflicts-1eb23552630b#.dcl1qlj7d for details.

1 parent 0803409 commit 3be082aCopy full SHA for 3be082a

1 file changed

+1

-0

lines changed

.gitattributes

1 file changed

+1

-0

lines changed

`‎.gitattributes`

+1

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

Comments

(0)