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

Diff for /src/usr.bin/diff3/diff3prog.c between version 1.10 and 1.11

version 1.10, 2008/02/27 18:10:05 version 1.11, 2009/10/27 23:59:37
Line 64 
Line 64 
  *      @(#)diff3.c     8.1 (Berkeley) 6/6/93   *      @(#)diff3.c     8.1 (Berkeley) 6/6/93
  */   */
   
 #ifndef lint  
 static const char copyright[] =  
 "@(#) Copyright (c) 1991, 1993\n\  
         The Regents of the University of California.  All rights reserved.\n";  
 #endif /* not lint */  
   
 #ifndef lint  
 static const char rcsid[] = "$OpenBSD$";  
 #endif /* not lint */  
   
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
 #include <string.h>  #include <string.h>

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