summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff/diff3.c
Commit message (Expand)AuthorAgeFilesLines
* Update the diff tools to diffutils-2.7 as in -current. This is morePeter Wemm1996-02-221-70/+134
* Remove trailing whitespace.Rodney W. Grimes1995-05-301-1/+1
* Fixed non-conflict errors that occur when changes made to the local files areNate Williams1995-02-201-8/+15
* Updated to GNU diffutils 2.6Nate Williams1993-11-121-173/+187
* Update diff, diff3, and sdiff's makefiles to use .PATH: instead ofJ.T. Conklin1993-07-091-0/+1693