summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/diff3
Commit message (Expand)AuthorAgeFilesLines
* Fixed non-conflict errors that occur when changes made to the local files arenate1995-02-201-0/+3
* Updated to GNU diffutils 2.6nate1993-11-121-5/+2
* From: Larry Jones <scjones@thor.sdrc.com>nate1993-11-082-1/+208
* Update diff, diff3, and sdiff's makefiles to use .PATH: instead ofconklin1993-07-091-7/+9
* GNU3 Diff 2.3nate1993-06-298-0/+3239
OpenPOWER on IntegriCloud