![[BACK]](/icons/back.gif){kind=icon}
Return to file.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs|
Return to file.c CVS log | Up to [local] / src / usr.bin / cvs |
| version 1.258, 2009/03/28 16:47:33 | version 1.259, 2010/07/13 20:47:19 | ||
|---|---|---|---|
|
|
||
| cf->file_status = FILE_MERGE; | cf->file_status = FILE_MERGE; | ||
| else | else | ||
| cf->file_status = FILE_PATCH; | cf->file_status = FILE_PATCH; | ||
| } else if (cf->file_ent->ce_conflict != NULL && | |||
| cf->file_status != FILE_MODIFIED) { | |||
| cf->file_status = FILE_CONFLICT; | |||
| } | } | ||
| } | } | ||
| } | } |