src/gnu/usr.bin/diff3, branch release/2.2.7_cvs

This commit was generated by cvs2svn to compensate for changes in r13122,

1995-12-30T19:02:48Z

which included commits to RCS files with non-trunk default branches.

Fixed non-conflict errors that occur when changes made to the local files are

1995-02-20T18:47:18Z

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 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

Updated to GNU diffutils 2.6

1993-11-12T07:05:54Z

From: Larry Jones

1993-11-08T01:36:04Z

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.

Update diff, diff3, and sdiff's makefiles to use .PATH: instead of

1993-07-09T20:36:06Z

copying the same files to multiple directories. This should make things easier when it comes time to update to a newer version of diffutils. With this checkin, this brings the netbsd and freebsd diff dists into sync.

GNU3 Diff 2.3

1993-06-29T08:19:28Z