Skip to content

Commit 3ea2236

Browse files
eregonitarato
authored andcommitted
Use union merge for spec/truffleruby.next-specs
1 parent e3e149e commit 3ea2236

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
/CHANGELOG.md merge=union
44

5+
/spec/truffleruby.next-specs merge=union
6+
57
# Rules for GitHub's Linguist language-classification system. We're abusing the
68
# 'vendored' attribute to exclude files as a lot of this isn't really vendored,
79
# and a whole lot of actually vendored code isn't listed! What we want to do is

0 commit comments

Comments
 (0)