![[BACK]](/icons/back.gif){kind=icon}
Return to cvs.h CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs|
Return to cvs.h CVS log | Up to [local] / src / usr.bin / cvs |
| version 1.110, 2006/05/30 06:34:39 | version 1.111, 2006/06/03 19:07:13 | ||
|---|---|---|---|
|
|
||
| int update_has_conflict_markers(struct cvs_file *); | int update_has_conflict_markers(struct cvs_file *); | ||
| #define CO_MERGE 0x01 | #define CO_MERGE 0x01 | ||
| #define CO_SETSTICKY 0x02 | |||
| #endif | #endif |