version 1.10, 2008/02/27 18:10:05 |
version 1.11, 2009/10/27 23:59:37 |
|
|
* @(#)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> |