(cvs-tree-merge, cvs-tags->tree): Use `butlast', not `cvs-butlast'.