From 940dedf27450070eb47f2fb55099de5f180a389b Mon Sep 17 00:00:00 2001
From: Richie Bendall <richiebendall@gmail.com>
Date: Fri, 19 Apr 2019 19:00:18 +1200
Subject: [PATCH] Ruby diff

---
 Rails.gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rails.gitattributes b/Rails.gitattributes
index 8514c9e..d59949d 100644
--- a/Rails.gitattributes
+++ b/Rails.gitattributes
@@ -4,4 +4,4 @@
 # Define a dummy ours merge strategy with:
 #
 # $ git config --global merge.ours.driver true
-schema.rb merge=ours
+schema.rb merge=ours diff=ruby