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

Diff for /src/usr.bin/diff3/diff3.1 between version 1.4 and 1.5

version 1.4, 2004/07/07 14:28:23 version 1.5, 2005/12/27 12:48:56
Line 180 
Line 180 
 .Xr diff 1 ,  .Xr diff 1 ,
 .Xr ed 1 ,  .Xr ed 1 ,
 .Xr merge 1 ,  .Xr merge 1 ,
 .Xr rcs 1  .Xr rcs 1 ,
   .Xr sdiff 1
 .Sh HISTORY  .Sh HISTORY
 A  A
 .Nm  .Nm

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5