nate 0171ba082e Fixed non-conflict errors that occur when changes made to the local files are ... 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		1995-02-20 18:47:18 +00:00
..
games	__386BSD__ -> __FreeBSD__	1994-11-04 02:14:13 +00:00
gnu2bmake	Integrated GCC-2.6.1 -> GCC-2.6.2 changes.	1994-11-15 04:52:19 +00:00
include	Put #warning "this file is obsoleted ... etc."	1994-11-17 11:20:44 +00:00
lib	Remove dir creating, done by mtree	1995-02-15 20:59:13 +00:00
libexec	Removed annoying changelog entries from ypclnt.c, added usage() function	1995-02-06 23:35:49 +00:00
usr.bin	Fixed non-conflict errors that occur when changes made to the local files are	1995-02-20 18:47:18 +00:00
usr.sbin	More DESTDIR lossage. Hopefully this will solve the case of the missing NIS	1995-02-15 04:35:55 +00:00
COPYING	This commit was manufactured by cvs2svn to create branch 'gnu'.	1993-11-08 17:09:51 +00:00
COPYING.LIB	Adding GPL docs, make structure.	1993-06-18 06:05:45 +00:00
Makefile	Hurm... I could have sworn I added usr.sbin to the top level GNU	1995-02-07 19:10:39 +00:00
Makefile.inc	Added gdb/gas/ld to GNU makefiles	1993-06-29 09:54:26 +00:00