diff options
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-30 13:48:13 -0700 |
|---|---|---|
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-30 13:48:13 -0700 |
| commit | 3e70a213f694b9d22455dfc1a86f4ee26191e4e2 (patch) | |
| tree | 236cb82a675a60d94cfd33638a2db2b3ff10959e | |
| parent | 39714f7de7524acfb731bb9dd1c2c5b3ca1e80c6 (diff) | |
| download | nasm-3e70a213f694b9d22455dfc1a86f4ee26191e4e2.tar.gz | |
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>
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..d94c5fb3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/version -merge |