summaryrefslogtreecommitdiff
path: root/usr.bin/diff3
AgeCommit message (Collapse)Author
2009-10-28rcsid[] and sccsid[] and copyright[] are essentially unmaintained (andTheo de Raadt
unmaintainable). these days, people use source. these id's do not provide any benefit, and do hurt the small install media (the 33,000 line diff is essentially mechanical) ok with the idea millert, ok dms
2008-02-27Properly 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-10Proper use of fseek/fseeko macros.Tobias Stoeckmann
OK joris@, otto@
2007-05-31convert to new .Dd format;Jason McIntyre
2006-02-22sort options + sync usage();Jason McIntyre
2006-01-28add -- after options, so files with leading - work.Ted Unangst
pr 4993 from jason.
2005-12-27+.Xr sdiff 1 ,Jason McIntyre
2005-11-22out-of-bounds access; ok otto@, millert@, deraadt@Markus Friedl
2005-08-01Use dynamic memory instead of a fixed table. Makes merges files withOtto Moerbeek
lots of changes possible. While there, kill an off-by-one. Report and testing by Alexander Bluhm. ok millert@
2005-03-30Use fgetln() to read lines so we are not limited to an arbitrarily smallTodd C. Miller
line length. OK otto@
2004-07-07- add shell prompt to command exampleJared Yanovich
- fix location of real diff3prog ok jmc@ otto@
2004-01-07Correctly test for cases where one file is different, and the other hasCan Erkin Acar
no more changes. ok millert@
2003-11-09Typos in comments from Jared Yanovich <jjy2+ at pitt dot edu>Otto Moerbeek
2003-10-24dont compare int to NULL, millert@ okAnil Madhavapeddy
2003-10-24- fix rcs Xr; from Jared YanovichJason McIntyre
- correct order for sections - remove unnecessary .Pp and -compact from display - kill some double spacing - sort SEE ALSO
2003-07-31Fix botched conversion to getopts; markus@Todd C. Miller
2003-07-22Install diff3.ksh with the correct name; noticed by TheoTodd C. Miller
2003-07-14knfTheo de Raadt
2003-07-10A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bitTodd C. Miller
(KNF and -Wall) and rewrote the shell front-end.