en Copyright 2015 Java http://172.16.0.5:8080/history/freebsd-14.2/usr.bin/diff3/tests/Makefile#d0b2dbfa Remove $FreeBSD$: one-line sh patternRemove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ List of files: /freebsd-14.2/usr.bin/diff3/tests/Makefile Wed, 16 Aug 2023 17:55:03 +0000 Warner Losh <imp@FreeBSD.org> http://172.16.0.5:8080/history/freebsd-14.2/usr.bin/diff3/tests/Makefile#034dd2d5 diff3: Add support for -mdiff3 in -m mode generates a complete file with changes bracketed withconflict markers. This adds support for diff3 to generate versioncontrol style three way merge output.The output format was inferred from looking at the gnu diff3 output on aselection of test files as a specification of what diff3 -m shouldoutput is not available. It is likely there are cases where the -moutput differs from other tools and I am happy to update diff3 toaddress these.Discussed with: pstef, kevansSponsored by: Klara, Inc. List of files: /freebsd-14.2/usr.bin/diff3/tests/Makefile Tue, 19 Apr 2022 15:20:24 +0000 Tom Jones <thj@FreeBSD.org> http://172.16.0.5:8080/history/freebsd-14.2/usr.bin/diff3/tests/Makefile#9ab079c5 diff3: Add support for -ADiff3 in -A mode generates an ed script to show how the 3 files andbrackets changes that conflict. The ed script generated should whenapplied leave familiar merge conflict markers in a patched file.Diff3 output is not documented, this feature has been arrived at bycomparing bsd diff3 output to gnu diff3 output until they were made toagree. There are likely to still be differences between these formats.The gnu diff3 guide is actually quite good at explaining how diff3output should appear, but it doesn't cover every form of output fromdiff3.https://www.gnu.org/software/diffutils/manual/diffutils.html#Comparing-Three-FilesDiscussed with: pstef, kevansSponsored by: Klara, Inc. List of files: /freebsd-14.2/usr.bin/diff3/tests/Makefile Tue, 19 Apr 2022 14:43:35 +0000 Tom Jones <thj@FreeBSD.org> http://172.16.0.5:8080/history/freebsd-14.2/usr.bin/diff3/tests/Makefile#7c03df68 diff3: allow diff3 ed scripts to generate deletionsdiff3 with the -e (ed script flag) can generate line deletions, addsupport for deletions and add a test case to exercise this behaviour.This functionality was unearthed through comparison of bsd diff3 and gnudiff3 output.Reviewed by: pstefSponsored by: Klara, Inc.Differential Revision: https://reviews.freebsd.org/D34912 List of files: /freebsd-14.2/usr.bin/diff3/tests/Makefile Fri, 15 Apr 2022 13:59:14 +0000 Tom Jones <thj@FreeBSD.org> http://172.16.0.5:8080/history/freebsd-14.2/usr.bin/diff3/tests/Makefile#9f7a81b1 diff3: document and test -TReviewed by: baptDifferential Revision: https://reviews.freebsd.org/D31650 List of files: /freebsd-14.2/usr.bin/diff3/tests/Makefile Mon, 23 Aug 2021 19:33:27 +0000 Piotr Pawel Stefaniak <pstef@FreeBSD.org> http://172.16.0.5:8080/history/freebsd-14.2/usr.bin/diff3/tests/Makefile#54a3415c diff3: implement --strip-trailing-crReviewed by: baptDifferential Revision: https://reviews.freebsd.org/D31626 List of files: /freebsd-14.2/usr.bin/diff3/tests/Makefile Sat, 21 Aug 2021 00:28:58 +0000 Piotr Pawel Stefaniak <pstef@FreeBSD.org> http://172.16.0.5:8080/history/freebsd-14.2/usr.bin/diff3/tests/Makefile#e1910ebd 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-14.2/usr.bin/diff3/tests/Makefile Thu, 25 May 2017 17:45:50 +0000 Baptiste Daroussin <bapt@FreeBSD.org>