Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Properly check if temporary files have been successfully opened. If not, | 2008-02-27 | 1 | -6/+6 | |
| | | | | | | print error message on stderr (instead of stdout). ok millert, ray, tedu | ||||
* | Proper use of fseek/fseeko macros. | 2007-09-10 | 1 | -4/+4 | |
| | | | | OK joris@, otto@ | ||||
* | out-of-bounds access; ok otto@, millert@, deraadt@ | 2005-11-22 | 1 | -4/+6 | |
| | |||||
* | Use dynamic memory instead of a fixed table. Makes merges files with | 2005-08-01 | 1 | -19/+57 | |
| | | | | | lots of changes possible. While there, kill an off-by-one. Report and testing by Alexander Bluhm. ok millert@ | ||||
* | Use fgetln() to read lines so we are not limited to an arbitrarily small | 2005-03-30 | 1 | -31/+42 | |
| | | | | line length. OK otto@ | ||||
* | Correctly test for cases where one file is different, and the other has | 2004-01-07 | 1 | -4/+4 | |
| | | | | | | no more changes. ok millert@ | ||||
* | Typos in comments from Jared Yanovich <jjy2+ at pitt dot edu> | 2003-11-09 | 1 | -5/+5 | |
| | |||||
* | dont compare int to NULL, millert@ ok | 2003-10-24 | 1 | -3/+3 | |
| | |||||
* | knf | 2003-07-14 | 1 | -31/+31 | |
| | |||||
* | A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bit | 2003-07-10 | 1 | -0/+566 | |
(KNF and -Wall) and rewrote the shell front-end. |