Nate Williams f8972f58e8 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
..
analyze.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
cmpbuf.c	Update to GNU diffutils 2.6	1993-11-12 07:06:35 +00:00
cmpbuf.h	Update to GNU diffutils 2.6	1993-11-12 07:06:35 +00:00
config.h	Update to GNU diffutils 2.6	1993-11-12 07:06:35 +00:00
context.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
COPYING
diff3.c	Fixed non-conflict errors that occur when changes made to the local files are	1995-02-20 18:47:18 +00:00
diff.1	From: Larry Jones <scjones@thor.sdrc.com>	1993-11-08 01:36:04 +00:00
diff.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
diff.h	Use -lgnuregex	1995-01-11 05:45:48 +00:00
dir.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
ed.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
fnmatch.h
getopt1.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
getopt.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
getopt.h
ifdef.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
io.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
Makefile	Use -lgnuregex	1995-01-11 05:45:48 +00:00
normal.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
regex.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
regex.h	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
sdiff.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
side.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
system.h	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
util.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
version.c	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00