[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.3 and 1.4

version 1.3, 2003/10/24 08:01:52 version 1.4, 2004/07/07 14:28:23
Line 119 
Line 119 
 .Ar file2 .  .Ar file2 .
 Applying the edit script generated by the command  Applying the edit script generated by the command
 .Pp  .Pp
 .Dl diff3 -E file1 file2 file3  .Dl $ diff3 -E file1 file2 file3
 .Pp  .Pp
 to  to
 .Ar file1  .Ar file1
Line 173 
Line 173 
 temporary file  temporary file
 .It Pa /tmp/d3b.XXXXXXXXXX  .It Pa /tmp/d3b.XXXXXXXXXX
 temporary file  temporary file
 .It Pa /usr/libexec/diff3  .It Pa /usr/libexec/diff3prog
 the actual executable  the actual executable
 .El  .El
 .Sh SEE ALSO  .Sh SEE ALSO
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4