Commit ed3a7a7

authored

Merge pull request #381 from TymurGubayev/patch-5

Configure `merge=union` for `changelog.txt` to reduce merge conflicts

2 parents 35a5e01 + 9a893d6 commit ed3a7a7Copy full SHA for ed3a7a7

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

Comments

(0)