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

Diff for /src/usr.bin/rcs/diff3.c between version 1.24 and 1.25

version 1.24, 2007/09/10 14:29:53 version 1.25, 2007/12/23 01:15:12
Line 137 
Line 137 
 static int eflag = 3;   /* default -E for compatibility with former RCS */  static int eflag = 3;   /* default -E for compatibility with former RCS */
 static int oflag = 1;   /* default -E for compatibility with former RCS */  static int oflag = 1;   /* default -E for compatibility with former RCS */
 static int debug  = 0;  static int debug  = 0;
 static char f1mark[40], f3mark[40];     /* markers for -E and -X */  static char f1mark[256], f3mark[256];   /* markers for -E and -X */
   
 static int duplicate(struct range *, struct range *);  static int duplicate(struct range *, struct range *);
 static int edit(struct diff *, int, int);  static int edit(struct diff *, int, int);
Legend:
Removed from v.1.24  
changed lines
  Added in v.1.25