index
:
src
cvs/HEAD
kms/intel
kms/radeon
master
OpenBSD base system
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
usr.bin
/
diff3
/
diff3prog.c
Age
Commit message (
Expand
)
Author
2021-04-13
Fix merging of files that lack a final \n at EOF after a block of common lines.
Stefan Sperling
2020-06-26
Fix merging of files that lack newlines for diff(3), OpenRCS, and OpenCVS.
Stefan Sperling
2016-10-18
Using bitwise OR along with two assignments in the conditional of
Todd C. Miller
2016-10-16
Remove useless n=n assignment in the first parse of a for().
Todd C. Miller
2015-10-09
Change all tame callers to namechange to pledge(2).
Theo de Raadt
2015-10-05
tame "stdio rpath" or tame "stdio" suffices for all of these programs.
Theo de Raadt
2015-09-05
Add brackets to clarify assignments that are the result of a test operator.
Jonathan Gray
2014-12-01
trivial reallocarray() use
Theo de Raadt
2013-11-15
Include unistd.h as it is the standard location for getopt().
Todd C. Miller
2012-03-04
In preparation for getline and getdelim additions to libc, rename getline()
Federico G. Schwindt
2009-10-28
rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and
Theo de Raadt
2008-02-27
Properly check if temporary files have been successfully opened. If not,
Tobias Stoeckmann
2007-09-10
Proper use of fseek/fseeko macros.
Tobias Stoeckmann
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
2005-03-30
Use fgetln() to read lines so we are not limited to an arbitrarily small
Todd C. Miller
2004-01-07
Correctly test for cases where one file is different, and the other has
Can Erkin Acar
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-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