summaryrefslogtreecommitdiff
path: root/usr.bin/diff3/diff3prog.c
AgeCommit message (Expand)Author
2008-02-27Properly check if temporary files have been successfully opened. If not,Tobias Stoeckmann
2007-09-10Proper use of fseek/fseeko macros.Tobias Stoeckmann
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
2005-03-30Use fgetln() to read lines so we are not limited to an arbitrarily smallTodd C. Miller
2004-01-07Correctly test for cases where one file is different, and the other hasCan Erkin Acar
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-07-14knfTheo de Raadt
2003-07-10A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bitTodd C. Miller