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

Diff for /src/usr.bin/cvs/diff3.c between version 1.53 and 1.54

version 1.53, 2010/07/23 21:46:05 version 1.54, 2010/10/29 17:49:37
Line 160 
Line 160 
         char *data, *patch;          char *data, *patch;
         char *argv[5], r1[CVS_REV_BUFSZ], r2[CVS_REV_BUFSZ];          char *argv[5], r1[CVS_REV_BUFSZ], r2[CVS_REV_BUFSZ];
         char *dp13, *dp23, *path1, *path2, *path3;          char *dp13, *dp23, *path1, *path2, *path3;
         BUF *b1, *b2, *b3, *d1, *d2, *diffb;          BUF *b1, *d1, *d2, *diffb;
         size_t dlen, plen;          size_t dlen, plen;
         struct rcs_line *lp;          struct rcs_line *lp;
         struct rcs_lines *dlines, *plines;          struct rcs_lines *dlines, *plines;
   
         overlapcnt = 0;          overlapcnt = 0;
         b1 = b2 = b3 = d1 = d2 = diffb = NULL;          b1 = d1 = d2 = diffb = NULL;
   
         rcsnum_tostr(d3rev1, r1, sizeof(r1));          rcsnum_tostr(d3rev1, r1, sizeof(r1));
         rcsnum_tostr(d3rev2, r2, sizeof(r2));          rcsnum_tostr(d3rev2, r2, sizeof(r2));
Legend:
Removed from v.1.53  
changed lines
  Added in v.1.54