Commit 9a893d6

authored

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

1 parent 64626c8 commit 9a893d6Copy full SHA for 9a893d6

1 file changed

+1

-0

lines changed

.gitattributes

1 file changed

+1

-0

lines changed

Diff for: `‎.gitattributes`

+1

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

Comments

(0)