[ILUG] cvs merge question...
diamond at skynet.ie
Tue Dec 10 12:40:03 GMT 2002
On Tue, Dec 10, 2002 at 12:28:59PM +0000, John Allen wrote:
> Just to be sure you are not going insane, do a
> cvs diff -r [rev from blah] -r [rev from balh-test] file-you-know-is-different
I'm insane already, but it doesn't seem to be affecting this. I've
checked that, and it still tells me that there's one line more in the
main branch than the sub-branch. Nargh.
"The Catholic Church may wish to consider conducting Mass in Pig Latin,
as it combines the solemnity of Latin with the accessibility of English."
More information about the ILUG