[BACK]Return to cvs.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / cvs

Diff for /src/usr.bin/cvs/cvs.h between version 1.182 and 1.183

version 1.182, 2015/04/04 14:19:10 version 1.183, 2017/05/28 17:11:34
Line 388 
Line 388 
 void    cvs_add_local(struct cvs_file *);  void    cvs_add_local(struct cvs_file *);
 int     update_has_conflict_markers(struct cvs_file *);  int     update_has_conflict_markers(struct cvs_file *);
 void    cvs_backup_file(struct cvs_file *);  void    cvs_backup_file(struct cvs_file *);
   void    cvs_import_ignored(const char *);
   
 #define CO_MERGE        0x01  #define CO_MERGE        0x01
 #define CO_SETSTICKY    0x02  #define CO_SETSTICKY    0x02

Legend:
Removed from v.1.182  
changed lines
  Added in v.1.183