summaryrefslogtreecommitdiffstats
path: root/usr.bin/diff3
AgeCommit message (Expand)AuthorFilesLines
2019-09-28Add where missing and harmonize PATH to be _PATH_DEFPATH (without local norajacoutot1-2/+2
2019-01-25I am retiring my old email address; replace it with my OpenBSD one.millert1-2/+2
2016-10-18Using bitwise OR along with two assignments in the conditional ofmillert1-2/+7
2016-10-16Remove useless n=n assignment in the first parse of a for().millert1-2/+2
2015-10-09Change all tame callers to namechange to pledge(2).deraadt1-3/+3
2015-10-05tame "stdio rpath" or tame "stdio" suffices for all of these programs.deraadt1-1/+4
2015-09-05Add brackets to clarify assignments that are the result of a test operator.jsg1-2/+2
2014-12-01trivial reallocarray() usederaadt1-5/+5
2013-11-15Include unistd.h as it is the standard location for getopt().millert1-3/+4
2012-03-04In preparation for getline and getdelim additions to libc, rename getline()fgsch1-5/+5
2009-10-27rcsid[] and sccsid[] and copyright[] are essentially unmaintained (andderaadt1-11/+1
2008-02-27Properly check if temporary files have been successfully opened. If not,tobias1-6/+6
2007-09-10Proper use of fseek/fseeko macros.tobias1-4/+4
2007-05-31convert to new .Dd format;jmc1-2/+2
2006-02-22sort options + sync usage();jmc2-19/+19
2006-01-28add -- after options, so files with leading - work.tedu1-4/+4
2005-12-27+.Xr sdiff 1 ,jmc1-2/+3
2005-11-22out-of-bounds access; ok otto@, millert@, deraadt@markus1-4/+6
2005-08-01Use dynamic memory instead of a fixed table. Makes merges files withotto1-19/+57
2005-03-30Use fgetln() to read lines so we are not limited to an arbitrarily smallmillert1-31/+42
2004-07-07- add shell prompt to command examplejaredy1-3/+3
2004-01-07Correctly test for cases where one file is different, and the other hascanacar1-4/+4
2003-11-09Typos in comments from Jared Yanovich <jjy2+ at pitt dot edu>otto1-5/+5
2003-10-24dont compare int to NULL, millert@ okavsm1-3/+3
2003-10-24- fix rcs Xr; from Jared Yanovichjmc1-12/+11
2003-07-31Fix botched conversion to getopts; markus@millert1-5/+8
2003-07-22Install diff3.ksh with the correct name; noticed by Theomillert1-2/+2
2003-07-14knfderaadt2-33/+33
2003-07-10A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bitmillert4-0/+840