caleb-brown/gitattributes
1
0
Fork 0
mirror of https://github.com/gitattributes/gitattributes.git synced 2025-01-22 00:08:52 -05:00
Code

Ruby diff

Browse Source
This commit is contained in:
Richie Bendall 2019-04-19 19:00:18 +12:00
parent c84166e390
commit 940dedf274
No known key found for this signature in database
GPG Key ID: 1C6A99DFA9D306FC
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rails.gitattributes
View File

@ -4,4 +4,4 @@
# Define a dummy ours merge strategy with: # Define a dummy ours merge strategy with:
# #
# $ git config --global merge.ours.driver true # $ git config --global merge.ours.driver true
schema.rb merge=ours schema.rb merge=ours diff=ruby