[PATCH 0 of 1] convert: added cvsnt mergepoint support

[Henrik Stuart]

As discussed with Greg Ward earlier, I have added an extra test for the
mergepoint logic by creating a proxy cvs command that either returns a
crafted rlog (from a CVSNT host), or otherwise just calling the system's
cvs command.

I have also modified the patch according to the other points he made.

Feel free to comment further.

-- 
Kind regards,
Henrik Stuart