procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
nasm/.gitattributes
H. Peter Anvin (Intel) 3e70a213f6 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 13:48:13 -07:00

1 line
16 B
Text
Raw Permalink Blame History

/version -merge
Reference in a new issue View git blame Copy permalink