Skip to content

Commit

Permalink
Use union merge driver for .toml files (#303)
Browse files Browse the repository at this point in the history
* Use union merge driver for .toml files

* gitattributes doesn't have comments apparently
  • Loading branch information
Duddino authored Mar 7, 2024
1 parent b70b035 commit 08361ef
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.toml merge=union

0 comments on commit 08361ef

Please sign in to comment.