Skip to content

Commit 6fc2430

Browse files
hadleyhadley
committed
Use union merge strategy for NEWS
1 parent 379597d commit 6fc2430

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/NEWS merge=union
1+
NEWS.md merge=union

0 commit comments

Comments
 (0)