src/gnu/usr.bin/diff3/diff3.1, branch release/2.2.7_cvs FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=release%2F2.2.7_cvs 1995-02-20T18:47:18Z Fixed non-conflict errors that occur when changes made to the local files are 1995-02-20T18:47:18Z Nate Williams nate@FreeBSD.org 1995-02-20T18:47:18Z urn:sha1:f8972f58e80f6a373cb71f90113e71f34100def9 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 From: Larry Jones <scjones@thor.sdrc.com> 1993-11-08T01:36:04Z Nate Williams nate@FreeBSD.org 1993-11-08T01:36:04Z urn:sha1:c4b4b635be7038515d10dc59515d5c099e28f728 Subject: man pages for diff et al. I finally got tired of not having man pages for diff and friends, so I edited the appropriate sections of the texinfo manual into man format.