[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.34 and 1.35

version 1.34, 2014/12/01 21:58:46 version 1.35, 2015/01/16 06:40:11
Line 126 
Line 126 
 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[MAXPATHLEN], f3mark[MAXPATHLEN];     /* markers for -E and -X */  static char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* 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.34  
changed lines
  Added in v.1.35