![[BACK]](/icons/back.gif){kind=icon}
Return to update.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs|
Return to update.c CVS log | Up to [local] / src / usr.bin / cvs |
| version 1.77, 2006/07/01 21:09:36 | version 1.78, 2006/07/02 21:01:48 | ||
|---|---|---|---|
|
|
||
| cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path); | cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path); | ||
| if (cf->fd == -1) | |||
| return (0); | |||
| if ((bp = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL) | if ((bp = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT)) == NULL) | ||
| fatal("update_has_conflict_markers: failed to load %s", | fatal("update_has_conflict_markers: failed to load %s", | ||
| cf->file_path); | cf->file_path); |