Hi,

Whats the definition of a conflict?

In particular, what's the *scope* of its search - is it per line, per couple of lines, 
etc?

I'm developing a CVS client and I'm not sure if some of the conflicts I'm getting are 
due to the server's algorithm, or because of a fault in the way I'm passing the file 
[from Windows] to the CVS server [on UNIX]...

For information, I'm using version 1.11 of the CVS server.

Many thanks,
Duncan.


_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com


_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Reply via email to