src - FreeBSD source tree

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge in/out comflicts caused by Diffutils-2.7 import...	Peter Wemm	1995-10-28	1	-70/+134
\| \| \| \| \| \| \| \|	In future, it should be as easy as "update -j ....", but this time I had to go over it by hand. Not nice.. Notes: svn path=/head/; revision=11886
*	Remove trailing whitespace.	Rodney W. Grimes	1995-05-30	1	-1/+1
\| \| \| \|	Notes: svn path=/head/; revision=8858
*	Fixed non-conflict errors that occur when changes made to the local files are	Nate Williams	1995-02-20	1	-8/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the same as the changes made in the repository. This is often seen by people with remote CVS trees that have applied their local patches to the master site. a 'cvs update' will show bogus conflicts. Obtained from: CVS mailing list, Stig<stig@inse.com> In diffutils 2.6 and 2.7, diff3 -A complains about identical overlapping changes. They're different from the ancestor but not from each other... Why bother? The patch below fixes this nonsense and preserves [B]ackwards compatiblity with the -B flag (also --show-bogus-conflicts). Party on... Stig Notes: svn path=/head/; revision=6575
*	Updated to GNU diffutils 2.6	Nate Williams	1993-11-12	1	-173/+187
\| \| \| \|	Notes: svn path=/head/; revision=753
*	Update diff, diff3, and sdiff's makefiles to use .PATH: instead of	J.T. Conklin	1993-07-09	1	-0/+1693
	copying the same files to multiple directories. This should make things easier when it comes time to update to a newer version of diffutils. With this checkin, this brings the netbsd and freebsd diff dists into sync. Notes: svn path=/head/; revision=116