[PATCH 0 of 3] resend v2: make CVSNT "mergepoints" test script work

[Greg Ward]

Resending my patch series from last week: these three patches transform
test-convert-cvs-builtincvsps-cvsnt-mergepoints -- a test script that
does not run (execute bit not set), does not work at all with CVS 1.11,
and works unreliably with CVS 1.12 -- into
test-convert-cvsnt-mergepoints, a reliable and fully functioning test
script.

Really: how bad can that be?  No changes to core code, just polishing a
broken test script into shape.  ;-)

        Greg