en Copyright 2025 Java http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#e9ac41698b2f322d55ccf9da50a3596edb2c1800 Remove residual blank line at start of MakefileThis is a residual of the $FreeBSD$ removal.MFC After: 3 days (though I'll just run the command on the branches)Sponsored by: Netflix List of files: /src/usr.bin/diff3/Makefile Mon, 15 Jul 2024 04:46:32 +0000 Warner Losh <imp@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf Remove $FreeBSD$: one-line sh patternRemove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ List of files: /src/usr.bin/diff3/Makefile Wed, 16 Aug 2023 17:55:03 +0000 Warner Losh <imp@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#e9ac41698b2f322d55ccf9da50a3596edb2c1800 Remove residual blank line at start of MakefileThis is a residual of the $FreeBSD$ removal.MFC After: 3 days (though I'll just run the command on the branches)Sponsored by: Netflix List of files: /src/usr.bin/diff3/Makefile Mon, 15 Jul 2024 04:46:32 +0000 Warner Losh <imp@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf Remove $FreeBSD$: one-line sh patternRemove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ List of files: /src/usr.bin/diff3/Makefile Wed, 16 Aug 2023 17:55:03 +0000 Warner Losh <imp@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#1409e715e64d67b3093a889e63b33ef48e280ec8 Merge ^/head r322398 through r322746. List of files: /src/usr.bin/diff3/Makefile Mon, 21 Aug 2017 11:56:47 +0000 Hans Petter Selasky <hselasky@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#82baa8db5e9cd91f5bea24a2a4c06a4a409b786d MFhead@r322515 List of files: /src/usr.bin/diff3/Makefile Mon, 14 Aug 2017 19:28:49 +0000 Enji Cooper <ngie@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#188e46ab0332a7887da6f1eb5494d92076e3d31e Add supporting changes for `Add limited sandbox capability to "make check"`Non-tests/... changes:- Add HAS_TESTS= to Makefiles with libraries and programs to enable iteration and propagate the appropriate environment down to *.test.mk.tests/... changes:- Add appropriate support Makefile.inc's to set HAS_TESTS in a minimal manner, since tests/... is a special subdirectory tree compared to the others.MFC after: 2 monthsMFC with: r322511Reviewed by: arch (silence), testing (silence)Differential Revision: D12014 List of files: /src/usr.bin/diff3/Makefile Mon, 14 Aug 2017 19:21:37 +0000 Enji Cooper <ngie@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#0275f9dbf73b01e9478dc7d6ab5fab4f8e077448 Merge ^/head r321383 through r322397. List of files: /src/usr.bin/diff3/Makefile Fri, 11 Aug 2017 10:59:34 +0000 Hans Petter Selasky <hselasky@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#d59ead01d83460374ba0e7be8096b1a66d737efb MFhead@r321970 List of files: /src/usr.bin/diff3/Makefile Thu, 03 Aug 2017 05:30:11 +0000 Enji Cooper <ngie@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#d511b20a693d77c1dc2491a62124471361eddd8e Add HAS_TESTS to all Makefiles that are currently using the`SUBDIR.${MK_TESTS}+= tests` idiom.This is a follow up to r321912. List of files: /src/usr.bin/diff3/Makefile Wed, 02 Aug 2017 08:50:42 +0000 Enji Cooper <ngie@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#46b37aa2c4068c1a237b0a7e61b8c2f953b3708c MFhead@r321912 List of files: /src/usr.bin/diff3/Makefile Wed, 02 Aug 2017 08:38:36 +0000 Enji Cooper <ngie@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#4b330699f819a81d8e34d471225143ffeb321855 Convert traditional ${MK_TESTS} conditional idiom for including testdirectories to SUBDIR.${MK_TESTS} idiomThis 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 List of files: /src/usr.bin/diff3/Makefile Wed, 02 Aug 2017 08:35:51 +0000 Enji Cooper <ngie@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#d02c951f8ec631d059ec7a8addb8a104cd160280 Merge ^/head r318658 through r318963. List of files: /src/usr.bin/diff3/Makefile Fri, 26 May 2017 19:11:24 +0000 Dimitry Andric <dim@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#e1910ebda4d5972aef64aaf67ea7bcbbba16fa4f Import working progress BSD diff3import bsd diff3 from OpenBSD.Differences with OpenBSD:- lots of warning fixed- no shell wrapper with diff3 actually living in libexec- capsicumizedKeep it disconnected as it is not yet good enough to replace GNU diffThe motivation to import it now it to allow other people to jump in and also tohave an open development on itObtained from: OpenBSD List of files: /src/usr.bin/diff3/Makefile Thu, 25 May 2017 17:45:50 +0000 Baptiste Daroussin <bapt@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#1409e715e64d67b3093a889e63b33ef48e280ec8 Merge ^/head r322398 through r322746. List of files: /src/usr.bin/diff3/Makefile Mon, 21 Aug 2017 11:56:47 +0000 Hans Petter Selasky <hselasky@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#82baa8db5e9cd91f5bea24a2a4c06a4a409b786d MFhead@r322515 List of files: /src/usr.bin/diff3/Makefile Mon, 14 Aug 2017 19:28:49 +0000 Enji Cooper <ngie@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#188e46ab0332a7887da6f1eb5494d92076e3d31e Add supporting changes for `Add limited sandbox capability to "make check"`Non-tests/... changes:- Add HAS_TESTS= to Makefiles with libraries and programs to enable iteration and propagate the appropriate environment down to *.test.mk.tests/... changes:- Add appropriate support Makefile.inc's to set HAS_TESTS in a minimal manner, since tests/... is a special subdirectory tree compared to the others.MFC after: 2 monthsMFC with: r322511Reviewed by: arch (silence), testing (silence)Differential Revision: D12014 List of files: /src/usr.bin/diff3/Makefile Mon, 14 Aug 2017 19:21:37 +0000 Enji Cooper <ngie@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#0275f9dbf73b01e9478dc7d6ab5fab4f8e077448 Merge ^/head r321383 through r322397. List of files: /src/usr.bin/diff3/Makefile Fri, 11 Aug 2017 10:59:34 +0000 Hans Petter Selasky <hselasky@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#d59ead01d83460374ba0e7be8096b1a66d737efb MFhead@r321970 List of files: /src/usr.bin/diff3/Makefile Thu, 03 Aug 2017 05:30:11 +0000 Enji Cooper <ngie@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/Makefile#d511b20a693d77c1dc2491a62124471361eddd8e Add HAS_TESTS to all Makefiles that are currently using the`SUBDIR.${MK_TESTS}+= tests` idiom.This is a follow up to r321912. List of files: /src/usr.bin/diff3/Makefile Wed, 02 Aug 2017 08:50:42 +0000 Enji Cooper <ngie@FreeBSD.org>