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
..
COPYING	GNU3 Diff 2.3	1993-06-29 08:19:28 +00:00
diff3.1	Fixed non-conflict errors that occur when changes made to the local files are	1995-02-20 18:47:18 +00:00
diff3.c	GNU3 Diff 2.3	1993-06-29 08:19:28 +00:00
getopt1.c	GNU3 Diff 2.3	1993-06-29 08:19:28 +00:00
getopt.c	GNU3 Diff 2.3	1993-06-29 08:19:28 +00:00
getopt.h	GNU3 Diff 2.3	1993-06-29 08:19:28 +00:00
Makefile	Updated to GNU diffutils 2.6	1993-11-12 07:05:54 +00:00
system.h	GNU3 Diff 2.3	1993-06-29 08:19:28 +00:00
version.c	GNU3 Diff 2.3	1993-06-29 08:19:28 +00:00