[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.48 and 1.49

version 1.48, 2008/03/09 01:52:55 version 1.49, 2009/06/06 14:17:27
Line 199 
Line 199 
                 cvs_printf("Retrieving revision %s\n", r2);                  cvs_printf("Retrieving revision %s\n", r2);
         fds[4] = rcs_rev_write_stmp(cf->file_rcs, d3rev2, path3, 0);          fds[4] = rcs_rev_write_stmp(cf->file_rcs, d3rev2, path3, 0);
   
         cvs_diffreg(path1, path3, fds[2], fds[4], d1);          cvs_diffreg(path1, path3, fds[2], fds[4], d1, D_FORCEASCII);
         cvs_diffreg(path2, path3, fds[3], fds[4], d2);          cvs_diffreg(path2, path3, fds[3], fds[4], d2, D_FORCEASCII);
   
         (void)xasprintf(&dp13, "%s/d13.XXXXXXXXXX", cvs_tmpdir);          (void)xasprintf(&dp13, "%s/d13.XXXXXXXXXX", cvs_tmpdir);
         fds[0] = cvs_buf_write_stmp(d1, dp13, NULL);          fds[0] = cvs_buf_write_stmp(d1, dp13, NULL);
Legend:
Removed from v.1.48  
changed lines
  Added in v.1.49