[nasm:nasm-2.15.xx] gitattributes: don't try to merge the version file

[nasm-bot for H. Peter Anvin (Intel)]

Commit-ID:  3e70a213f694b9d22455dfc1a86f4ee26191e4e2
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=3e70a213f694b9d22455dfc1a86f4ee26191e4e2
Author:     H. Peter Anvin (Intel) <hpa at zytor.com>
AuthorDate: Tue, 30 Jun 2020 13:48:13 -0700
Committer:  H. Peter Anvin (Intel) <hpa at zytor.com>
CommitDate: Tue, 30 Jun 2020 13:48:13 -0700

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 at zytor.com>


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

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