src/usr.bin/diff3, branch releng/12.2 FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=releng%2F12.2 2019-12-06T18:26:34Z MFC r340138 (by oshogbo): 2019-12-06T18:26:34Z Mark Johnston markj@FreeBSD.org 2019-12-06T18:26:34Z urn:sha1:10a93cc038a7876c7cd4ae1b399ff4afbdbf8aa9 capsicum: use a new capsicum helpers in tools Convert `cap_enter() < 0 && errno != ENOSYS` to `caph_enter() < 0`. 2018-06-19T23:43:14Z Mariusz Zaborski oshogbo@FreeBSD.org 2018-06-19T23:43:14Z urn:sha1:7672a0148f79063eac8f8e0beb0db5350d02d5d4 No functional change intended. DIRDEPS_BUILD: Connect new directories. 2017-10-31T00:04:07Z Bryan Drewery bdrewery@FreeBSD.org 2017-10-31T00:04:07Z urn:sha1:3806950135d2c8633ec0764e8807eacc87cf3e10 Sponsored by: Dell EMC Isilon Add HAS_TESTS to all Makefiles that are currently using the 2017-08-02T08:50:42Z Enji Cooper ngie@FreeBSD.org 2017-08-02T08:50:42Z urn:sha1:d511b20a693d77c1dc2491a62124471361eddd8e `SUBDIR.${MK_TESTS}+= tests` idiom. This is a follow up to r321912. Convert traditional ${MK_TESTS} conditional idiom for including test 2017-08-02T08:35:51Z Enji Cooper ngie@FreeBSD.org 2017-08-02T08:35:51Z urn:sha1:4b330699f819a81d8e34d471225143ffeb321855 directories to SUBDIR.${MK_TESTS} idiom This is being done to pave the way for future work (and homogenity) in ^/projects/make-check-sandbox . No functional change intended. MFC after: 1 weeks Update the diff3 manpage to reflect the fact the version in freebsd does 2017-05-25T18:46:13Z Baptiste Daroussin bapt@FreeBSD.org 2017-05-25T18:46:13Z urn:sha1:9500abb088b81472d52941ad73f592396a684af8 not use temporary files nor uses a /usr/libexec/diff3prog For now comment tests for arguments which are not in par with GNU diff3 yet 2017-05-25T17:58:01Z Baptiste Daroussin bapt@FreeBSD.org 2017-05-25T17:58:01Z urn:sha1:cb5a670ececeae05a9c1e90a56f71b4219342ef5 Remove the MAX_CHECK macro, it was initially used to test if a file was a 2017-05-25T17:55:40Z Baptiste Daroussin bapt@FreeBSD.org 2017-05-25T17:55:40Z urn:sha1:433115a0a49e9f26ef51c1906ca0c04bc8270248 text file or not. The check is not done by diff3 but by diff (the argument -a is directly passed to diff(1)) Import working progress BSD diff3 2017-05-25T17:45:50Z Baptiste Daroussin bapt@FreeBSD.org 2017-05-25T17:45:50Z urn:sha1:e1910ebda4d5972aef64aaf67ea7bcbbba16fa4f 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