[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.40 and 1.41

version 1.40, 2008/02/11 20:33:11 version 1.41, 2008/02/23 23:42:23
Line 172 
Line 172 
         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));

Legend:
Removed from v.1.40  
changed lines
  Added in v.1.41