summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/diff3.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fix merging of files that lack newlines for diff(3), OpenRCS, and OpenCVS.stsp2020-06-261-2/+9
* When system calls indicate an error they return -1, not some arbitraryderaadt2019-06-281-4/+4
* Using bitwise OR along with two assignments in the conditional ofmillert2016-10-181-2/+7
* Remove useless n=n assignment in the first parse of a for().millert2016-10-161-2/+2
* Quiet compiler warnings. OK tomc@ tb@millert2016-10-151-3/+4
* Remove xfree(), like already done for RCS. From Michael W Bombardieri,nicm2015-11-051-20/+14
* Add brackets to clarify assignments that are the result of a test operator.jsg2015-09-051-2/+2
* Replace <sys/param.h> with <limits.h> and other less dirty headers wherederaadt2015-01-161-2/+2
* An internal function called xrealloc() is actually a fail-hardderaadt2014-12-011-6/+6
* In preparation for getline and getdelim additions to libc, rename getline()fgsch2012-03-041-5/+5
* Nuke some unused variables and remove an unnecessary call to dirname().nicm2010-10-291-3/+3
* Reduce variable/function name and whitespace differences betweenray2010-07-231-24/+23
* Rename a bunch of variables and functions, removing the cvs_/rcs_ray2010-07-231-4/+4
* rcsid[] and sccsid[] and copyright[] are essentially unmaintained (andderaadt2009-10-271-12/+1
* More cvs/diff/rcs convergence:ray2009-06-071-4/+4
* Sync some rcsdiff changes to cvsdiff. As a side effect,ray2009-06-061-4/+4
* unused varjoris2008-03-091-3/+3
* add checkout/update -j support.joris2008-03-081-23/+44
* correct usage of lseek(2);joris2008-03-081-5/+5
* when reopening the file pass the proper mode and reopen it usingjoris2008-03-011-3/+3
* handle file permissions and owners properly.joris2008-02-291-3/+3
* nobody needs weird debug messagesjoris2008-02-281-5/+2
* prevent file racesjoris2008-02-271-23/+45
* reset overlapcnt at each cvs_merge_file() call so that files thatjoris2008-02-231-2/+3
* Cleanup buf implementation:tobias2008-02-111-6/+6
* Imported atomicio interface.tobias2007-09-171-3/+5
* Proper use of fseek/fseeko macros.tobias2007-09-101-4/+5
* Sync revisions and time buffers size to be consistent with each others.xsa2007-06-281-3/+3
* Since xrealloc dies on failure it is safe to directly assign to theray2007-05-291-19/+11
* general includes cleanup sweep. ok joris@ niallo@otto2007-02-221-4/+8
* snprintf() -> xsnprintf()xsa2007-01-311-9/+4
* add merging support in both local and remote sides.joris2007-01-281-48/+46
* major re-work of the RCS api. this results in 100x performance improvements in some places and muchniallo2007-01-121-21/+8
* complete binary support for opencvs,joris2007-01-121-5/+2
* rework opencvs so that we can deal with binary files. previously we assumed all files were ascii,niallo2007-01-111-6/+17
* sync with usr.bin/rcs/diff3.cxsa2006-11-101-8/+11
* respect TMPDIR here too, changes pulled in from usr.bin/rcs.xsa2006-11-091-11/+20
* Check that string length != 0 before setting buf[strlen(buf) - 1].ray2006-10-241-2/+4
* Remove file mode argument from {cvs|rcs}_buf_write_stmp(). Weray2006-07-081-7/+7
* add cvs_buf_load_fd() which does the same as cvs_buf_load()joris2006-06-141-4/+5
* commit the new opencvs code, i have been hacking onjoris2006-05-271-9/+9
* more nasty spaces go bye byederaadt2006-04-141-8/+8
* Use variable names for sizeof, remove casts in front of xmalloc,ray2006-04-051-11/+13
* Today is Integer Overflow Prevention Day:ray2006-03-281-7/+7
* Correct integer types, remove unused arguments, non-portable bitshiftsray2006-03-251-11/+12
* kill two unused variables.xsa2006-03-161-6/+5
* add an argument to cvs_diff3() to be able to handle verbosity ofxsa2006-03-141-6/+8
* adapt informative message if we are sending output to stdout.xsa2006-03-061-5/+2
* if the submitted rev(s) is/are the same as the head rev, skip the processxsa2006-03-061-4/+4
* oops, forgot the diff3.c portion of this diff:niallo2006-03-051-7/+7