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

Diff for /src/usr.bin/rcs/diff3.c between version 1.5 and 1.6

version 1.5, 2006/05/04 07:06:58 version 1.6, 2006/05/08 10:19:34
Line 171 
Line 171 
                 goto out;                  goto out;
   
         if (verbose == 1)          if (verbose == 1)
                 printf("Retrieving revision %s\n", r1);                  (void)fprintf(stderr, "retrieving revision %s\n", r1);
         if ((b2 = rcs_getrev(rf, rev1)) == NULL)          if ((b2 = rcs_getrev(rf, rev1)) == NULL)
                 goto out;                  goto out;
   
         if (verbose == 1)          if (verbose == 1)
                 printf("Retrieving revision %s\n", r2);                  (void)fprintf(stderr, "retrieving revision %s\n", r2);
         if ((b3 = rcs_getrev(rf, rev2)) == NULL)          if ((b3 = rcs_getrev(rf, rev2)) == NULL)
                 goto out;                  goto out;
   
Line 235 
Line 235 
         if ((diffb = rcs_patchfile(data, patch, ed_patch_lines)) == NULL)          if ((diffb = rcs_patchfile(data, patch, ed_patch_lines)) == NULL)
                 goto out;                  goto out;
   
         if (verbose == 1 && diff3_conflicts != 0) {          if (verbose == 1 && diff3_conflicts != 0)
                 warnx("%d conflict%s found during merge, "                  warnx("warning: overlaps or other problems during merge");
                     "please correct.", diff3_conflicts,  
                     (diff3_conflicts > 1) ? "s" : "");  
         }  
   
         xfree(data);          xfree(data);
         xfree(patch);          xfree(patch);
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6