| version 1.56, 2014/12/01 21:58:46 |
version 1.57, 2015/01/16 06:40:07 |
|
|
| static int eflag; |
static int eflag; |
| static int oflag; /* indicates whether to mark overlaps (-E or -X)*/ |
static int oflag; /* indicates whether to mark overlaps (-E or -X)*/ |
| static int debug = 0; |
static int debug = 0; |
| static char f1mark[MAXPATHLEN], f3mark[MAXPATHLEN]; /* markers for -E and -X */ |
static char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */ |
| |
|
| static int duplicate(struct range *, struct range *); |
static int duplicate(struct range *, struct range *); |
| static int edit(struct diff *, int, int); |
static int edit(struct diff *, int, int); |
![[BACK]](/icons/back.gif){kind=icon}
Return to diff3.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs