[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.3 and 1.4

version 1.3, 2003/10/24 20:32:06 version 1.4, 2003/11/09 20:13:57
Line 200 
Line 200 
 }  }
   
 /*  /*
  * Pick up the line numbers of allcahnges from one change file.   * Pick up the line numbers of all changes from one change file.
  * (This puts the numbers in a vector, which is not strictly necessary,   * (This puts the numbers in a vector, which is not strictly necessary,
  * since the vector is processed in one sequential pass.   * since the vector is processed in one sequential pass.
  * The vector could be optimized out of existence)   * The vector could be optimized out of existence)
Line 346 
Line 346 
                         dup = duplicate(&d1->old,&d2->old);                          dup = duplicate(&d1->old,&d2->old);
                         /*                          /*
                          * dup = 0 means all files differ                           * dup = 0 means all files differ
                          * dup = 1 meands files 1 and 2 identical                           * dup = 1 means files 1 and 2 identical
                          */                           */
                         if (eflag==0) {                          if (eflag==0) {
                                 separate(dup ? "3" : "");                                  separate(dup ? "3" : "");
Line 441 
Line 441 
 }  }
   
 /*  /*
  * skip to just befor line number from in file "i".  If "pr" is non-NULL,   * skip to just before line number from in file "i".  If "pr" is non-NULL,
  * print all skipped stuff with string pr as a prefix.   * print all skipped stuff with string pr as a prefix.
  */   */
 int  int
Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4