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) <[email protected]>
netwide-assembler · Jun 30, 2020 · 3e70a21 · 3e70a21
1 parent 39714f7
commit 3e70a21
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/version -merge