Commit 3f3d036

authored

Reduce conflict on Misc/NEWS (GH-212)

use "union" merge strategy for Misc/NEWS.

1 parent 32e8f9b commit 3f3d036Copy full SHA for 3f3d036

1 file changed

+1

-0

lines changed

.gitattribute

1 file changed

+1

-0

lines changed

`‎.gitattribute`

+1

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Misc/NEWS merge=union`

Comments

(0)