forked from aniani/nasm
3e70a213f6
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>
2 lines
16 B
Plaintext
2 lines
16 B
Plaintext
/version -merge
|