[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.45 and 1.46

version 1.45, 2008/03/01 14:40:23 version 1.46, 2008/03/08 11:53:36
Line 216 
Line 216 
         argv[argc++] = path2;          argv[argc++] = path2;
         argv[argc++] = path3;          argv[argc++] = path3;
   
         if (lseek(fds[2], SEEK_SET, 0) < 0)          if (lseek(fds[2], 0, SEEK_SET) < 0)
                 fatal("cvs_merge_file: lseek fds[2]: %s", strerror(errno));                  fatal("cvs_merge_file: lseek fds[2]: %s", strerror(errno));
         if (lseek(fds[3], SEEK_SET, 0) < 0)          if (lseek(fds[3], 0, SEEK_SET) < 0)
                 fatal("cvs_merge_file: lseek fds[3]: %s", strerror(errno));                  fatal("cvs_merge_file: lseek fds[3]: %s", strerror(errno));
         if (lseek(fds[4], SEEK_SET, 0) < 0)          if (lseek(fds[4], 0, SEEK_SET) < 0)
                 fatal("cvs_merge_file: lseek fds[4]: %s", strerror(errno));                  fatal("cvs_merge_file: lseek fds[4]: %s", strerror(errno));
   
         diff3_conflicts = diff3_internal(argc, argv, cf->file_path, r2);          diff3_conflicts = diff3_internal(argc, argv, cf->file_path, r2);
Legend:
Removed from v.1.45  
changed lines
  Added in v.1.46