Age | Commit message (Collapse) | Author | |
---|---|---|---|
2008-02-27 | Properly check if temporary files have been successfully opened. If not, | Tobias Stoeckmann | |
print error message on stderr (instead of stdout). ok millert, ray, tedu | |||
2007-09-10 | Proper use of fseek/fseeko macros. | Tobias Stoeckmann | |
OK joris@, otto@ | |||
2007-05-31 | convert to new .Dd format; | Jason McIntyre | |
2006-02-22 | sort options + sync usage(); | Jason McIntyre | |
2006-01-28 | add -- after options, so files with leading - work. | Ted Unangst | |
pr 4993 from jason. | |||
2005-12-27 | +.Xr sdiff 1 , | Jason McIntyre | |
2005-11-22 | out-of-bounds access; ok otto@, millert@, deraadt@ | Markus Friedl | |
2005-08-01 | Use dynamic memory instead of a fixed table. Makes merges files with | Otto Moerbeek | |
lots of changes possible. While there, kill an off-by-one. Report and testing by Alexander Bluhm. ok millert@ | |||
2005-03-30 | Use fgetln() to read lines so we are not limited to an arbitrarily small | Todd C. Miller | |
line length. OK otto@ | |||
2004-07-07 | - add shell prompt to command example | Jared Yanovich | |
- fix location of real diff3prog ok jmc@ otto@ | |||
2004-01-07 | Correctly test for cases where one file is different, and the other has | Can Erkin Acar | |
no more changes. ok millert@ | |||
2003-11-09 | Typos in comments from Jared Yanovich <jjy2+ at pitt dot edu> | Otto Moerbeek | |
2003-10-24 | dont compare int to NULL, millert@ ok | Anil Madhavapeddy | |
2003-10-24 | - fix rcs Xr; from Jared Yanovich | Jason McIntyre | |
- correct order for sections - remove unnecessary .Pp and -compact from display - kill some double spacing - sort SEE ALSO | |||
2003-07-31 | Fix botched conversion to getopts; markus@ | Todd C. Miller | |
2003-07-22 | Install diff3.ksh with the correct name; noticed by Theo | Todd C. Miller | |
2003-07-14 | knf | Theo de Raadt | |
2003-07-10 | A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bit | Todd C. Miller | |
(KNF and -Wall) and rewrote the shell front-end. |