Better merge support

Merging, like branching, is painful in CVS. The key problem is that there are usually a lot of changes on both the main branch of a project and the sub-branch. Merging is likely to find a lot of conflicts unless the sub-branch has tracked changes in the main tree carefully.