summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/diff/diff3.c
Commit message (Collapse)AuthorAgeFilesLines
* Switch to contrib versionache1997-10-291-1778/+0
|
* Merge in/out comflicts caused by Diffutils-2.7 import...peter1995-10-281-70/+134
| | | | | In future, it should be as easy as "update -j ....", but this time I had to go over it by hand. Not nice..
* Remove trailing whitespace.rgrimes1995-05-301-1/+1
|
* Fixed non-conflict errors that occur when changes made to the local files arenate1995-02-201-8/+15
| | | | | | | | | | | | | | | | 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-176/+190
|
* Update diff, diff3, and sdiff's makefiles to use .PATH: instead ofconklin1993-07-091-0/+1693
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.
OpenPOWER on IntegriCloud