aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3/tests/diff3_test.sh
Commit message (Collapse)AuthorAgeFilesLines
* For now comment tests for arguments which are not in par with GNU diff3 yetBaptiste Daroussin2017-05-251-5/+5
| | | | Notes: svn path=/head/; revision=318890
* Import working progress BSD diff3Baptiste Daroussin2017-05-251-0/+46
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