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>
1 line
16 B
Text
1 line
16 B
Text
/version -merge
|