Rename CVSNT "mergepoints" test and make it executable. - rename test-convert-cvs-builtincvsps-cvsnt-mergepoints (and related files) to test-convert-cvsnt-mergepoints - this ensures that the test will be run, but does NOT make it pass: in particularly, it fails regularly for me due to the inconsistent behaviour of CVS itself - expect "Branchpoints:" in debugcvsps output

abort: repository a not found!
255
abort: error: Connection refused
255
abort: repository a not found!
255
abort: Permission denied: ../a
255
abort: repository a not found!
255
destination directory: q
abort: destination 'q' is not empty
abort: destination 'a' is not empty
255
adding c
255
dir is still here
repo is gone