Commit 54cd963

committed

Union merging for CHANGES.txt

https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/ Signed-off-by: Chris Warrick <[email protected]>

1 parent df80757 commit 54cd963Copy full SHA for 54cd963

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`	`+CHANGES.txt merge=union`

Comments

(0)