[cvsnt] merge?

[David Somers]

Running build 1976...

having successfully imported two bits of third-party code into a vendor
branch, I'm now trying to merge them.

# cvs co -jWX_2_5_3 -jWX_2_6_0 prj/wxWidgets
[snip]
# cvs commit -m "merge release 260"
[snip]
cvs commit: Examining prj/wxWidgets/wxPython/wxSWIG/swig_lib/python
cvs commit: Examining prj/wxWidgets/wxPython/wxSWIG/swig_lib/tcl
cvs commit: Examining prj/wxWidgets/wxPython/wxversion
cvs server: nothing known about `-m'
cvs server: nothing known about `merge release 260
'
cvs server: nothing known about `--'
cvs server: Examining prj
cvs server: Examining prj/wxWidgets
[snip]
cvs server: Examining prj/wxWidgets/wxPython/wxSWIG/swig_lib/tcl
cvs [server aborted]: correct above errors first!
#

Um.... is it me, or is cvsnt getting confused about that comment (-m).

Any enlightenment welcome.

Cheers,

David