procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
nasm/.gitattributes

2 lines
16 B
Text
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-06-30 20:48:13 +00:00
/version -merge
Reference in a new issue Copy permalink