[Emacs-diffs] Changes to emacs/man/pcl-cvs.texi

[Richard M. Stallman]

Index: emacs/man/pcl-cvs.texi
diff -c emacs/man/pcl-cvs.texi:1.22 emacs/man/pcl-cvs.texi:1.23
*** emacs/man/pcl-cvs.texi:1.22 Mon Sep 29 09:44:26 2003
--- emacs/man/pcl-cvs.texi      Tue Sep 30 16:40:50 2003
***************
*** 1,5 ****
  \input texinfo  @c -*-texinfo-*-
! @c "@(#)$Name:  $:$Id: pcl-cvs.texi,v 1.22 2003/09/29 13:44:26 ttn Exp $"
  @c %**start of header
  @setfilename ../info/pcl-cvs
  @settitle PCL-CVS --- Emacs Front-End to CVS
--- 1,5 ----
  \input texinfo  @c -*-texinfo-*-
! @c "@(#)$Name:  $:$Id: pcl-cvs.texi,v 1.23 2003/09/30 20:40:50 rms Exp $"
  @c %**start of header
  @setfilename ../info/pcl-cvs
  @settitle PCL-CVS --- Emacs Front-End to CVS
***************
*** 1088,1094 ****
  This command use @code{ediff} (or @code{emerge}, see above) to allow you
  to do an interactive 3-way merge.
  
! @strong{Note:}  When the file status is @samp{Conflict},
  CVS has already performed a merge.  The resulting file is not used in
  any way if you use this command.  If you use the @kbd{q} command inside
  @samp{ediff} (to successfully terminate a merge) the file that CVS
--- 1088,1094 ----
  This command use @code{ediff} (or @code{emerge}, see above) to allow you
  to do an interactive 3-way merge.
  
! @strong{Please note:}  when the file status is @samp{Conflict},
  CVS has already performed a merge.  The resulting file is not used in
  any way if you use this command.  If you use the @kbd{q} command inside
  @samp{ediff} (to successfully terminate a merge) the file that CVS