[cvsnt] "C <filename>" vs "warning: conflict"

[Andreas Tscharner]

Hello World,

I've noticed that TortoiseCVS does not always show up the "Resolve 
conflict" dialog if a conflict happens during an update. I was told on 
the TortoiseCVS list that TortoiseCVS parses for a "C <filename>" but 
CVSNT seems to print "warning conflict" in certain circumstances.

When does this happen? Is it possible to print the same message in all 
conflict cases?

Best regards
	Andreas
-- 
Andreas Tscharner                          andreas.tscharner at metromec.ch
------------------------------------------------------------------------
And the beast shall come forth surrounded by a roiling cloud of
vengeance. The house of the unbelievers shall be razed and they shall be
scorched to the earth. Their tags shall blink until the end of days.
                                             -- The Book of Mozilla 12:10