add no-ff comment to readme.txt
merge readme.txt with no-ff