[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.43 and 1.44

version 1.43, 2008/02/28 20:35:27 version 1.44, 2008/02/29 21:43:57
Line 247 
Line 247 
         }          }
   
         (void)close(cf->fd);          (void)close(cf->fd);
         cf->fd = open(cf->file_path, O_WRONLY | O_TRUNC);          cf->fd = open(cf->file_path, O_CREAT | O_WRONLY | O_TRUNC);
         if (cf->fd == -1) {          if (cf->fd == -1) {
                 fatal("cvs_merge_file: failed to reopen fd for writing: %s",                  fatal("cvs_merge_file: failed to reopen fd for writing: %s",
                     strerror(errno));                      strerror(errno));
Legend:
Removed from v.1.43  
changed lines
  Added in v.1.44