From 3e70a213f694b9d22455dfc1a86f4ee26191e4e2 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin (Intel)" <hpa@zytor.com>
Date: Tue, 30 Jun 2020 13:48:13 -0700
Subject: gitattributes: don't try to merge the version file

Don't try to merge the version file... if there is a conflict, keep
the current version.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..d94c5fb3
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/version -merge
-- 
cgit v1.2.1