summaryrefslogtreecommitdiff
path: root/usr.bin/diff3/tests/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Remove $FreeBSD$: one-line sh patternWarner Losh2023-08-231-1/+0
| | | | | | | Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ Similar commit in main: (cherry picked from commit d0b2dbfa0ecf)
* diff3: document and test -TPiotr Pawel Stefaniak2021-09-251-0/+1
| | | | (cherry picked from commit 9f7a81b133c715f649136dcd0ad004e4180c56c9)
* diff3: implement --strip-trailing-crPiotr Pawel Stefaniak2021-09-251-0/+1
| | | | (cherry picked from commit 54a3415cb69e1ea0e6533ca3fc168deba64f249f)
* Import working progress BSD diff3Baptiste Daroussin2017-05-251-0/+21
import bsd diff3 from OpenBSD. Differences with OpenBSD: - lots of warning fixed - no shell wrapper with diff3 actually living in libexec - capsicumized Keep it disconnected as it is not yet good enough to replace GNU diff The motivation to import it now it to allow other people to jump in and also to have an open development on it Obtained from: OpenBSD Notes: svn path=/head/; revision=318888