Return to diff3.c CVS log | Up to [local] / src / usr.bin / cvs |
version 1.40, 2008/02/11 20:33:11 | version 1.41, 2008/02/23 23:42:23 | ||
---|---|---|---|
|
|
||
struct cvs_line *lp; | struct cvs_line *lp; | ||
struct cvs_lines *dlines, *plines; | struct cvs_lines *dlines, *plines; | ||
overlapcnt = 0; | |||
b1 = b2 = b3 = d1 = d2 = diffb = NULL; | b1 = b2 = b3 = d1 = d2 = diffb = NULL; | ||
rcsnum_tostr(cf->file_ent->ce_rev, r1, sizeof(r1)); | rcsnum_tostr(cf->file_ent->ce_rev, r1, sizeof(r1)); | ||
rcsnum_tostr(cf->file_rcsrev, r2, sizeof(r2)); | rcsnum_tostr(cf->file_rcsrev, r2, sizeof(r2)); |