diff options
| author | nate <nate@FreeBSD.org> | 1995-02-20 18:47:18 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1995-02-20 18:47:18 +0000 |
| commit | 0171ba082e45abe54b7fad6aa60d2d3d0fd62733 (patch) | |
| tree | 51360a61ea63ec3ea1690350c779bb28ec6197af /gnu/usr.bin/diff3 | |
| parent | 45d8ca0c0fbf5d7d3e8c43d34fea368f72e0efc3 (diff) | |
| download | FreeBSD-src-0171ba082e45abe54b7fad6aa60d2d3d0fd62733.zip FreeBSD-src-0171ba082e45abe54b7fad6aa60d2d3d0fd62733.tar.gz | |
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
Diffstat (limited to 'gnu/usr.bin/diff3')
| -rw-r--r-- | gnu/usr.bin/diff3/diff3.1 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu/usr.bin/diff3/diff3.1 b/gnu/usr.bin/diff3/diff3.1 index b190328..9873b08 100644 --- a/gnu/usr.bin/diff3/diff3.1 +++ b/gnu/usr.bin/diff3/diff3.1 @@ -39,6 +39,9 @@ into .IR mine , surrounding all conflicts with bracket lines. .TP +.B \-B +Old behavior of -A. Shows non-conflicts. +.TP .B \-e Generate an .I ed |
