Return to diff3prog.c CVS log | Up to [local] / src / usr.bin / diff3 |
version 1.7, 2005/08/01 08:17:57 | version 1.8, 2005/11/22 16:00:49 | ||
---|---|---|---|
|
|
||
(*dd)[i].new.from = c; | (*dd)[i].new.from = c; | ||
(*dd)[i].new.to = d; | (*dd)[i].new.to = d; | ||
} | } | ||
(*dd)[i].old.from = (*dd)[i-1].old.to; | if (i) { | ||
(*dd)[i].new.from = (*dd)[i-1].new.to; | (*dd)[i].old.from = (*dd)[i-1].old.to; | ||
(*dd)[i].new.from = (*dd)[i-1].new.to; | |||
} | |||
(void)fclose(fp[0]); | (void)fclose(fp[0]); | ||
return (i); | return (i); | ||
} | } |