[BACK]Return to rcsmerge.1 CVS log [TXT][DIR] Up to [local] / src / usr.bin / rcs

Diff for /src/usr.bin/rcs/rcsmerge.1 between version 1.10 and 1.11

version 1.10, 2006/04/27 09:58:12 version 1.11, 2006/05/08 10:02:02
Line 96 
Line 96 
 overwriting the working copy:  overwriting the working copy:
 .Pp  .Pp
 .Dl $ rcsmerge -r2.8 -r2.4 foo.c  .Dl $ rcsmerge -r2.8 -r2.4 foo.c
   .Sh DIAGNOSTICS
   The
   .Nm
   utility exits with one of the following values:
   .Pp
   .Bl -tag -width Ds -compact -offset indent
   .It 0
   No overlaps.
   .It 1
   Overlaps were found.
   .It 2
   An error occurred.
   .El
 .Sh SEE ALSO  .Sh SEE ALSO
 .Xr ci 1 ,  .Xr ci 1 ,
 .Xr co 1 ,  .Xr co 1 ,

Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11