summaryrefslogtreecommitdiffstats
path: root/contrib/cvs/src/diff.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge rev 1.16: implement -j for cvs diff, allowing tag:date based diffsobrien2008-01-131-66/+100
| | | | into version 1.11.22.
* Fix merge typo. Add missing ",".peter2004-04-151-1/+1
|
* Initial merge of cvs-1.11.5 -> 1.11.15 changes onto mainlinepeter2004-04-151-185/+251
|
* Merge cvs-1.11.2.1-20021201 -> 1.11.5 changes onto mainlinepeter2003-01-211-1/+1
|
* Merge 1.11.2 -> 1.11.2.1-20021201 changes onto mainlinepeter2002-12-021-2/+3
| | | | Approved by: re
* Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainlinepeter2002-09-021-37/+85
|
* Implement -j for cvs diff, allowing tag:date based diffs (normally date-baseddillon2001-09-151-25/+56
| | | | | | diffs are against the head branch only). MFC after: 1 week
* Initial merge of cvs-1.11 -> 1.11.1p1 changes onto mainline. There ispeter2001-08-101-59/+57
| | | | still some suspicious and/or broken stuff to fix yet.
* Merge cyclic changes for 1.10.7 only our mainline.peter1999-12-111-6/+26
|
* Fixed style bugs in FreeBSD changes. KNF style doesn't apply to gnubde1999-07-041-4/+4
| | | | sources.
* Don't assume branch heads are alive.. (related to previous change to thepeter1999-05-101-1/+2
| | | | older 1.9.26 baseline)
* Merge cvs-1.9.xx -> 1.10 changes onto mainline.peter1999-03-181-6/+17
| | | | | | The merge turned up a long-standing bug in local additions. I'm not quite sure it's right yet. (the code in question is dealing with diffs relative to "HEAD" and dead revisions).
* Merge changes from vendor branch into mainlinepeter1998-03-101-11/+8
|
* Merge changes from CYCLIC branch onto mainline. rcs.[ch] still to come.peter1998-01-261-41/+103
|
* Back out my -L change, now "patch -I" usage supposed to get Index:ache1998-01-211-13/+7
| | | | precedence
* Fix wrong ---/*** names produced using -L diff optionache1998-01-161-7/+13
| | | | CVS gurus from info-cvs agrees that previous Index: usage is bogus
* Merge conflicts from 970523 importpeter1997-05-231-1/+1
|
* Attempt to work around the problem Bruce reported with 'cvs diff -rHEAD'peter1997-05-211-2/+4
| | | | | complaining about long-deleted files having been deleted and that there is no diff available.
* Merge import conflictspeter1997-05-151-169/+453
|
* Ay, merge from RELENG_2_2. Back out the "moving HEAD" fix.asami1996-12-191-2/+2
|
* Fix the "moving head" problem.asami1996-12-121-2/+2
|
* Import of slightly trimmed cvs-1.8 distribution. Generated filespeter1996-08-201-0/+623
and non-unix code has been left out.
OpenPOWER on IntegriCloud