From b17e9080bf9c66722044f638b9303d9bb53d7dc9 Mon Sep 17 00:00:00 2001
From: Sarah Maddox <sarahmaddox@google.com>
Date: Tue, 4 Dec 2018 19:33:39 +1300
Subject: [PATCH] Add a .gitattributes file to ignore the resources files in
 diffs and merge conflicts.

---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..73c00df21e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# Ignore the resources files in diffs and merge conflicts
+resources/    linguist-generated=true
+resources/    -diff -merge