From 07ab9737cdcff28c5413018426577d6e6852f89c Mon Sep 17 00:00:00 2001
From: Noa <coolreader18@gmail.com>
Date: Tue, 26 Apr 2022 20:39:16 -0500
Subject: [PATCH] Mark generated lalrpop as -merge -diff

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

diff --git a/.gitattributes b/.gitattributes
index 9de680b00..c214d0773 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
 Lib/** linguist-vendored
-parser/src/python.rs linguist-generated
+parser/src/python.rs linguist-generated -diff -merge