summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff3
Commit message (Expand)AuthorAgeFilesLines
* $Id$ -> $FreeBSD$Peter Wemm1999-08-271-1/+1
* Switch to contrib versionAndrey A. Chernov1997-10-291-4/+11
* This commit was generated by cvs2svn to compensate for changes in r13122,Peter Wemm1995-12-307-3230/+0
* Fixed non-conflict errors that occur when changes made to the local files areNate Williams1995-02-201-0/+3
* Updated to GNU diffutils 2.6Nate Williams1993-11-121-5/+2
* From: Larry Jones <scjones@thor.sdrc.com>Nate Williams1993-11-082-1/+208
* Update diff, diff3, and sdiff's makefiles to use .PATH: instead ofJ.T. Conklin1993-07-091-7/+9
* GNU3 Diff 2.3Nate Williams1993-06-298-0/+3239