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

Diff for /src/usr.bin/rcs/merge.1 between version 1.3 and 1.4

version 1.3, 2010/10/28 15:08:50 version 1.4, 2018/06/07 11:37:21
Line 57 
Line 57 
 .It Fl V  .It Fl V
 Print RCS's version number.  Print RCS's version number.
 .El  .El
 .Sh EXAMPLES  .Sh EXIT STATUS
 Using labels:  
 .Bd -literal -offset indent  
 $ merge -q -p -L one -L two -L three file1 file2 file3  
 <<<<<<< one  
 =======  
 bar  
 >>>>>>> three  
 .Ed  
 .Sh DIAGNOSTICS  
 The  The
 .Nm  .Nm
 utility exits with one of the following values:  utility exits with one of the following values:
Line 79 
Line 70 
 .It 2  .It 2
 An error occurred.  An error occurred.
 .El  .El
   .Sh EXAMPLES
   Using labels:
   .Bd -literal -offset indent
   $ merge -q -p -L one -L two -L three file1 file2 file3
   <<<<<<< one
   =======
   bar
   >>>>>>> three
   .Ed
 .Sh SEE ALSO  .Sh SEE ALSO
 .Xr co 1 ,  .Xr co 1 ,
 .Xr diff 1 ,  .Xr diff 1 ,
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4