en Copyright 2015 Java http://kernelsources.org:8080/source/history/freebsd/usr.bin/diff3/tests/7.out#d02c951f8ec631d059ec7a8addb8a104cd160280 Merge ^/head r318658 through r318963. List of files: /freebsd/usr.bin/diff3/tests/7.out Fri, 26 May 2017 21:11:24 +0200 Dimitry Andric <dim@FreeBSD.org> http://kernelsources.org:8080/source/history/freebsd/usr.bin/diff3/tests/7.out#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: /freebsd/usr.bin/diff3/tests/7.out Thu, 25 May 2017 19:45:50 +0200 Baptiste Daroussin <bapt@FreeBSD.org>