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

Diff for /src/usr.bin/cvs/rcs.h between version 1.62 and 1.63

version 1.62, 2006/05/27 03:30:31 version 1.63, 2006/05/28 01:24:28
Line 40 
Line 40 
 #define RCS_HEAD_INIT           "1.1"  #define RCS_HEAD_INIT           "1.1"
 #define RCS_HEAD_REV            ((RCSNUM *)(-1))  #define RCS_HEAD_REV            ((RCSNUM *)(-1))
   
   #define RCS_CONFLICT_MARKER1    "<<<<<<< "
   #define RCS_CONFLICT_MARKER2    ">>>>>>> "
   #define RCS_CONFLICT_MARKER3    "=======\n"
   
 #define RCS_SYM_INVALCHAR       "$,.:;@"  #define RCS_SYM_INVALCHAR       "$,.:;@"
   

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.63