cvsps: add test for merge detection (
issue1615).
Currently only testing convert.cvsps.mergefrom; this script should also
probably test convert.cvsps.mergeto.
convert/cvs: add an option to disable remote log caching
Useful for debugging or testing when using --tmpdir.