src - FreeBSD source tree

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed non-conflict errors that occur when changes made to the local files are	Nate Williams	1995-02-20	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
*	From: Larry Jones <scjones@thor.sdrc.com>	Nate Williams	1993-11-08	1	-0/+207
	Subject: man pages for diff et al. I finally got tired of not having man pages for diff and friends, so I edited the appropriate sections of the texinfo manual into man format. Notes: svn path=/head/; revision=726