[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.6 and 1.7

version 1.6, 2005/11/08 16:06:03 version 1.7, 2005/12/03 01:02:08
Line 235 
Line 235 
         argv[argc++] = path1;          argv[argc++] = path1;
         argv[argc++] = path2;          argv[argc++] = path2;
         argv[argc++] = path3;          argv[argc++] = path3;
         if ((diff3_conflicts = diff3_internal(argc, argv, workfile, r2)) < 0)  
           diff3_conflicts = diff3_internal(argc, argv, workfile, r2);
           if (diff3_conflicts < 0) {
                   cvs_buf_free(diffb);
                   diffb = NULL;
                 goto out;                  goto out;
           }
   
         if (cvs_buf_putc(diffb, '\0') < 0) {          if (cvs_buf_putc(diffb, '\0') < 0) {
                 cvs_buf_free(diffb);                  cvs_buf_free(diffb);
                   diffb = NULL;
                 goto out;                  goto out;
         }          }
   
         if (cvs_buf_putc(b1, '\0') < 0) {          if (cvs_buf_putc(b1, '\0') < 0) {
                 cvs_buf_free(diffb);                  cvs_buf_free(diffb);
                   diffb = NULL;
                 goto out;                  goto out;
         }          }
   
Line 257 
Line 264 
   
         if ((diffb = cvs_patchfile(data, patch, ed_patch_lines)) == NULL)          if ((diffb = cvs_patchfile(data, patch, ed_patch_lines)) == NULL)
                 goto out;                  goto out;
   
           if (diff3_conflicts != 0) {
                   cvs_printf("%d conflict%s found during merge, please correct.\n",
                       diff3_conflicts, (diff3_conflicts > 1) ? "s" : "");
           }
   
         free(data);          free(data);
         free(patch);          free(patch);
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7