mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2024-11-27 08:10:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
888d9ab550
nasm/.gitattributes

2 lines
16 B
Plaintext
Raw Normal View History

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>
2020-07-01 04:48:13 +08:00
/version -merge
Reference in New Issue Copy Permalink