f8972f58e8
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
|
||
|---|---|---|
| .. | ||
| COPYING | ||
| Makefile | ||
| analyze.c | ||
| cmpbuf.c | ||
| cmpbuf.h | ||
| config.h | ||
| context.c | ||
| diff.1 | ||
| diff.c | ||
| diff.h | ||
| diff3.c | ||
| dir.c | ||
| ed.c | ||
| fnmatch.h | ||
| getopt.c | ||
| getopt.h | ||
| getopt1.c | ||
| ifdef.c | ||
| io.c | ||
| normal.c | ||
| regex.c | ||
| regex.h | ||
| sdiff.c | ||
| side.c | ||
| system.h | ||
| util.c | ||
| version.c | ||