![[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.146, 2008/05/30 16:14:34 | version 1.147, 2008/06/08 16:32:34 | ||
|---|---|---|---|
|
|
||
| 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) | if (cf->fd == -1 || cf->file_ent == NULL) | ||
| return (0); | return (0); | ||
| bp = cvs_buf_load_fd(cf->fd); | bp = cvs_buf_load_fd(cf->fd); |