[Issue 254] New - lack of information in cvs.texinfo: update does nothing or merges bu t also show conflicts

https://ccvs.cvshome.org/issues/show_bug.cgi?id=254
                 Issue #|254
                 Summary|lack of information in cvs.texinfo: update does nothin
                        |g or merges but also show conflicts
               Component|ccvs
                 Version|current
                Platform|All
                     URL|
              OS/Version|All
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P4
            Subcomponent|documentation
             Assigned to|issues@ccvs
             Reported by|fred_maranhao






------- Additional comments from [email protected] Sun Jun 12 09:15:06 -0700 2005 -------
in ccvs/doc/cvs.texinfo:

  Your modifications to a file are never lost when you
  use @code{update}.  If no newer revision exists,
  running @code{update} has no effect.  If you have
  edited the file, and a newer revision is available,
  @sc{cvs} will merge all changes into your working copy.

the text above don't talk that in some cases, instead of
a merge, the update will show that a conflict exists.