(cvs-tree-merge): Use cvs-butlast (avoid CL).