<feed xmlns='http://www.w3.org/2005/Atom'>
<title>src/usr.bin/diff3/tests, branch releng/13.4</title>
<subtitle>FreeBSD source tree</subtitle>
<id>https://cgit-dev.freebsd.org/src/atom?h=releng%2F13.4</id>
<link rel='self' href='https://cgit-dev.freebsd.org/src/atom?h=releng%2F13.4'/>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/'/>
<updated>2023-08-23T17:43:30Z</updated>
<entry>
<title>Remove $FreeBSD$: one-line sh pattern</title>
<updated>2023-08-23T17:43:30Z</updated>
<author>
<name>Warner Losh</name>
<email>imp@FreeBSD.org</email>
</author>
<published>2023-08-22T01:32:01Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=023fc80ee38a117fa65b2ccb2abf8bdc7dbd6fd9'/>
<id>urn:sha1:023fc80ee38a117fa65b2ccb2abf8bdc7dbd6fd9</id>
<content type='text'>
Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/

Similar commit in main:
(cherry picked from commit d0b2dbfa0ecf)
</content>
</entry>
<entry>
<title>diff3: document and test -T</title>
<updated>2021-09-25T08:34:39Z</updated>
<author>
<name>Piotr Pawel Stefaniak</name>
<email>pstef@FreeBSD.org</email>
</author>
<published>2021-08-23T19:33:27Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=a8446d4124d0639b0fe49e25642a18a51fde8666'/>
<id>urn:sha1:a8446d4124d0639b0fe49e25642a18a51fde8666</id>
<content type='text'>
(cherry picked from commit 9f7a81b133c715f649136dcd0ad004e4180c56c9)
</content>
</entry>
<entry>
<title>diff3: implement --strip-trailing-cr</title>
<updated>2021-09-25T08:34:39Z</updated>
<author>
<name>Piotr Pawel Stefaniak</name>
<email>pstef@FreeBSD.org</email>
</author>
<published>2021-08-21T00:28:58Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=dbabfd7e26763ac295ed0ee8bc77f3f3b58b6d03'/>
<id>urn:sha1:dbabfd7e26763ac295ed0ee8bc77f3f3b58b6d03</id>
<content type='text'>
(cherry picked from commit 54a3415cb69e1ea0e6533ca3fc168deba64f249f)
</content>
</entry>
<entry>
<title>DIRDEPS_BUILD: Connect new directories.</title>
<updated>2017-10-31T00:04:07Z</updated>
<author>
<name>Bryan Drewery</name>
<email>bdrewery@FreeBSD.org</email>
</author>
<published>2017-10-31T00:04:07Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=3806950135d2c8633ec0764e8807eacc87cf3e10'/>
<id>urn:sha1:3806950135d2c8633ec0764e8807eacc87cf3e10</id>
<content type='text'>
Sponsored by:	Dell EMC Isilon
</content>
</entry>
<entry>
<title>For now comment tests for arguments which are not in par with GNU diff3 yet</title>
<updated>2017-05-25T17:58:01Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2017-05-25T17:58:01Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=cb5a670ececeae05a9c1e90a56f71b4219342ef5'/>
<id>urn:sha1:cb5a670ececeae05a9c1e90a56f71b4219342ef5</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Import working progress BSD diff3</title>
<updated>2017-05-25T17:45:50Z</updated>
<author>
<name>Baptiste Daroussin</name>
<email>bapt@FreeBSD.org</email>
</author>
<published>2017-05-25T17:45:50Z</published>
<link rel='alternate' type='text/html' href='https://cgit-dev.freebsd.org/src/commit/?id=e1910ebda4d5972aef64aaf67ea7bcbbba16fa4f'/>
<id>urn:sha1:e1910ebda4d5972aef64aaf67ea7bcbbba16fa4f</id>
<content type='text'>
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
</content>
</entry>
</feed>
