summaryrefslogtreecommitdiff
path: root/contrib/cvs/diff/diff3.c
Commit message (Collapse)AuthorAgeFilesLines
* This commit was manufactured by cvs2svn to create tagrelease/6.3.0_cvscvs2svn2008-01-151-1/+1
| | | | | | 'RELENG_6_3_0_RELEASE'. This commit was manufactured to restore the state of the 6.3-RELEASE image.
* Initial merge of cvs-1.11.5 -> 1.11.15 changes onto mainlinePeter Wemm2004-04-151-0/+1
| | | | Notes: svn path=/head/; revision=128269
* Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainlinePeter Wemm2002-09-021-3/+3
| | | | Notes: svn path=/head/; revision=102843
* Initial merge of cvs-1.11 -> 1.11.1p1 changes onto mainline. There isPeter Wemm2001-08-101-23/+44
| | | | | | | still some suspicious and/or broken stuff to fix yet. Notes: svn path=/head/; revision=81407
* Merge changes from 1.10.7 -> 1.11 into mainline. Note that the oldPeter Wemm2000-10-021-4/+6
| | | | | | | anoncvs no-password hack is gone and is replaced by the official version. Notes: svn path=/head/; revision=66528
* Take a shot at using mkstemp() since we have a __warn_references() onPeter Wemm1999-12-111-1/+4
| | | | | | | the other temporary file creation functions.. Notes: svn path=/head/; revision=54440
* Import cvs-1.10.7. There are a number of nasty bugs that have been fixed.Peter Wemm1999-12-111-7/+7
| | | | | | | Obtained from: cyclic.com Notes: svn path=/vendor/cvs/dist/; revision=54427
* Import cvs-1.10 onto vendor branch. Merge to follow shortly.Peter Wemm1999-03-181-125/+219
| | | | | | | Obtained from: cyclic.com Notes: svn path=/vendor/cvs/dist/; revision=44852
* Import cvs-1.9.23 as at 19980123. There are a number of really nicePeter Wemm1998-01-261-0/+1809
things fixed in here, including the '-ko' vs. -A problem with remote cvs which caused all files with -ko to be resent each time (which is damn painful over a modem, I can tell you). It also found a heap of stray empty directories that should have been pruned with the -P flag to cvs update but were not for some reason. It also has the fully integrated rcs and diff, so no more fork/exec overheads for rcs,ci,patch,diff,etc. This means that it parses the control data in the rcs files only once rather than twice or more. If the 'cvs diff' vs. Index thing is going to be fixed for future patch compatability, this is the place to do it. Notes: svn path=/vendor/cvs/dist/; revision=32785
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-12 20:01:22 +0000