[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.15 and 1.16

version 1.15, 2015/09/05 09:47:08 version 1.16, 2015/10/05 13:30:30
Line 145 
Line 145 
 {  {
         int ch, i, m, n;          int ch, i, m, n;
   
           if (tame("stdio rpath", NULL) == -1)
                   err(1, "tame");
   
         eflag = 0;          eflag = 0;
         oflag = 0;          oflag = 0;
         while ((ch = getopt(argc, argv, "EeXx3")) != -1) {          while ((ch = getopt(argc, argv, "EeXx3")) != -1) {

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.16