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

Diff for /src/usr.bin/rcs/rcsmerge.c between version 1.50 and 1.51

version 1.50, 2007/02/27 07:59:13 version 1.51, 2007/06/30 08:23:49
Line 37 
Line 37 
 rcsmerge_main(int argc, char **argv)  rcsmerge_main(int argc, char **argv)
 {  {
         int fd, ch, flags, kflag, status;          int fd, ch, flags, kflag, status;
         char fpath[MAXPATHLEN], r1[16], r2[16], *rev_str1, *rev_str2;          char fpath[MAXPATHLEN], r1[RCS_REV_BUFSZ], r2[RCS_REV_BUFSZ];
           char *rev_str1, *rev_str2;
         RCSFILE *file;          RCSFILE *file;
         RCSNUM *rev1, *rev2;          RCSNUM *rev1, *rev2;
         BUF *bp;          BUF *bp;

Legend:
Removed from v.1.50  
changed lines
  Added in v.1.51