Mark generated lalrpop as -merge -diff

coolreader18 · coolreader18 · commit 07ab9737cdcf · 2022-04-26T20:39:16.000-05:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`Lib/** linguist-vendored`
`2`		`-parser/src/python.rs linguist-generated`
	`2`	`+parser/src/python.rs linguist-generated -diff -merge`