CVSROOT:        /cvs
Module name:    src
Changes by:     [email protected]    2010/07/13 14:47:19

Modified files:
        usr.bin/cvs    : file.c 

Log message:
Do not put the file into conflict if it is no longer modified (user has
edited it back to repository state).

ok zinovik

Reply via email to