cvs merge -j branch-name