Skip to content

Commit 0664a3f

Browse files
mitsuhikomitsuhiko
committed
Set merge strategy for CHANGES
1 parent 83fd5b2 commit 0664a3f

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CHANGES merge=union

0 commit comments

Comments
 (0)