summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/diff3
Commit message (Collapse)AuthorAgeFilesLines
* This commit was generated by cvs2svn to compensate for changes in r13122,peter1995-12-307-3230/+0
| | | | which included commits to RCS files with non-trunk default branches.
* Fixed non-conflict errors that occur when changes made to the local files arenate1995-02-201-0/+3
| | | | | | | | | | | | | | | | 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
* Updated to GNU diffutils 2.6nate1993-11-121-5/+2
|
* From: Larry Jones <scjones@thor.sdrc.com>nate1993-11-082-1/+208
| | | | | | | 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 ofconklin1993-07-091-7/+9
| | | | | | | | | 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.3nate1993-06-298-0/+3239
OpenPOWER on IntegriCloud