[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.24 and 1.25

version 1.24, 2006/05/27 03:30:30 version 1.25, 2006/06/14 14:10:50
Line 155 
Line 155 
 int diff3_conflicts = 0;  int diff3_conflicts = 0;
   
 BUF *  BUF *
 cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2, int verbose)  cvs_diff3(RCSFILE *rf, char *workfile, int workfd, RCSNUM *rev1,
           RCSNUM *rev2, int verbose)
 {  {
         int argc;          int argc;
         char *data, *patch;          char *data, *patch;
Line 169 
Line 170 
         rcsnum_tostr(rev1, r1, sizeof(r1));          rcsnum_tostr(rev1, r1, sizeof(r1));
         rcsnum_tostr(rev2, r2, sizeof(r2));          rcsnum_tostr(rev2, r2, sizeof(r2));
   
         if ((b1 = cvs_buf_load(workfile, BUF_AUTOEXT)) == NULL)          if ((b1 = cvs_buf_load_fd(workfd, BUF_AUTOEXT)) == NULL)
                 goto out;                  goto out;
   
         if (verbose == 1)          if (verbose == 1)
Legend:
Removed from v.1.24  
changed lines
  Added in v.1.25