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

Diff for /src/usr.bin/diff3/diff3prog.c between version 1.17 and 1.18

version 1.17, 2015/10/09 01:37:07 version 1.18, 2016/10/16 13:03:40
Line 543 
Line 543 
         int j,k;          int j,k;
         char block[BUFSIZ];          char block[BUFSIZ];
   
         for (n = n; n > 0; n--) {          for (; n > 0; n--) {
                 if (!oflag || !overlap[n])                  if (!oflag || !overlap[n])
                         prange(&de[n].old);                          prange(&de[n].old);
                 else                  else

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.18