version 1.62, 2016/10/18 21:06:52 |
version 1.63, 2019/06/28 13:35:00 |
|
|
argv[argc++] = path2; |
argv[argc++] = path2; |
argv[argc++] = path3; |
argv[argc++] = path3; |
|
|
if (lseek(fds[2], 0, SEEK_SET) < 0) |
if (lseek(fds[2], 0, SEEK_SET) == -1) |
fatal("cvs_merge_file: lseek fds[2]: %s", strerror(errno)); |
fatal("cvs_merge_file: lseek fds[2]: %s", strerror(errno)); |
if (lseek(fds[3], 0, SEEK_SET) < 0) |
if (lseek(fds[3], 0, SEEK_SET) == -1) |
fatal("cvs_merge_file: lseek fds[3]: %s", strerror(errno)); |
fatal("cvs_merge_file: lseek fds[3]: %s", strerror(errno)); |
if (lseek(fds[4], 0, SEEK_SET) < 0) |
if (lseek(fds[4], 0, SEEK_SET) == -1) |
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); |