summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/diff3/diff3.1
Commit message (Expand)AuthorAgeFilesLines
* Fixed non-conflict errors that occur when changes made to the local files areNate Williams1995-02-201-0/+3
* From: Larry Jones <scjones@thor.sdrc.com>Nate Williams1993-11-081-0/+207