Merge proposals

cvs2svn in Ubuntu has no merge proposals.