History log of /freebsd-9.3-release/contrib/cvs/diff/diff3.c
Revision Date Author Comments
(<<< Hide modified files)
(Show modified files >>>)
# 267654 19-Jun-2014 gjb

Copy stable/9 to releng/9.3 as part of the 9.3-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

# 225736 22-Sep-2011 kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by: re (implicit)


# 128269 14-Apr-2004 peter

Initial merge of cvs-1.11.5 -> 1.11.15 changes onto mainline


# 102843 02-Sep-2002 peter

Initial merge of 1.11.1p1 -> 1.11.2 changes onto mainline


# 81407 10-Aug-2001 peter

Initial merge of cvs-1.11 -> 1.11.1p1 changes onto mainline. There is
still some suspicious and/or broken stuff to fix yet.


# 66528 02-Oct-2000 peter

Merge changes from 1.10.7 -> 1.11 into mainline. Note that the old
anoncvs no-password hack is gone and is replaced by the official version.


# 54440 11-Dec-1999 peter

Take a shot at using mkstemp() since we have a __warn_references() on
the other temporary file creation functions..


# 54428 11-Dec-1999 peter

This commit was generated by cvs2svn to compensate for changes in r54427,
which included commits to RCS files with non-trunk default branches.


# 54427 11-Dec-1999 peter

Import cvs-1.10.7. There are a number of nasty bugs that have been fixed.

Obtained from: cyclic.com


# 44852 18-Mar-1999 peter

Import cvs-1.10 onto vendor branch. Merge to follow shortly.

Obtained from: cyclic.com


# 32785 26-Jan-1998 peter

Import cvs-1.9.23 as at 19980123. There are a number of really nice
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.