aboutsummaryrefslogtreecommitdiff
path: root/usr.bin/diff3/diff3.c
Commit message (Collapse)AuthorAgeFilesLines
* MFC r340138 (by oshogbo):Mark Johnston2019-12-061-3/+3
| | | | | | | capsicum: use a new capsicum helpers in tools Notes: svn path=/stable/12/; revision=355455
* Convert `cap_enter() < 0 && errno != ENOSYS` to `caph_enter() < 0`.Mariusz Zaborski2018-06-191-1/+1
| | | | | | | No functional change intended. Notes: svn path=/head/; revision=335395
* Remove the MAX_CHECK macro, it was initially used to test if a file was aBaptiste Daroussin2017-05-251-2/+0
| | | | | | | | | | text file or not. The check is not done by diff3 but by diff (the argument -a is directly passed to diff(1)) Notes: svn path=/head/; revision=318889
* Import working progress BSD diff3Baptiste Daroussin2017-05-251-0/+787
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