summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorBlaise Thompson <blaise@untzag.com>2026-09-20 11:26:36 -0500
committerBlaise Thompson <blaise@untzag.com>2026-09-20 11:26:36 -0500
commita56fd902a033134e0d1d5eae373d0ea1bba08c1c (patch)
tree9ad51b7e75b4ec6c200d13b3d37f5533113a80dc /.gitattributes
parentfe5d33d4411cb4034cdd6638aa8d944d6883931f (diff)
turtlesHEADmaster
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..997504b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# SCM syntax highlighting & preventing 3-way merges
+pixi.lock merge=binary linguist-language=YAML linguist-generated=true -diff