en Copyright 2025 Java http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b diff3: fix merge modeMake the merge mode compatible with GNU diff3Add tests for all the changes, those tests are extracted from theetcupdate testsuite.This version passes the etcupdate testsuite and the diffutils diff3test suite.MFC After: 1 week List of files: /src/usr.bin/diff3/tests/Makefile Fri, 13 Feb 2026 16:10:44 +0000 Baptiste Daroussin <bapt@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/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/tests/Makefile Mon, 15 Jul 2024 04:46:32 +0000 Warner Losh <imp@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#b37a6938e39a7ed9542fafee671465bf719fd537 diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3In gnu diff3 3 way merging files where the new file and the target arealready the same will die and show what has failed to be merged exceptif -E is passed in argument, in this case it will finish the merge.This difference in behaviour was breaking one of the etcupdate testcasewith bsd diff3Reviewed by: emasteDifferential Revision: https://reviews.freebsd.org/D41730 List of files: /src/usr.bin/diff3/tests/Makefile Tue, 05 Sep 2023 11:24:53 +0000 Baptiste Daroussin <bapt@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf Remove $FreeBSD$: one-line sh patternRemove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ List of files: /src/usr.bin/diff3/tests/Makefile Wed, 16 Aug 2023 17:55:03 +0000 Warner Losh <imp@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#034dd2d54f2e7e33897cfd5ede7c50b3d67d18d3 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: /src/usr.bin/diff3/tests/Makefile Tue, 19 Apr 2022 15:20:24 +0000 Tom Jones <thj@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#9ab079c5e81098c81e8b25f26a3b56392eac5463 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: /src/usr.bin/diff3/tests/Makefile Tue, 19 Apr 2022 14:43:35 +0000 Tom Jones <thj@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#7c03df6855f451749501748b98019c8e2d9d9600 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: /src/usr.bin/diff3/tests/Makefile Fri, 15 Apr 2022 13:59:14 +0000 Tom Jones <thj@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#9f7a81b133c715f649136dcd0ad004e4180c56c9 diff3: document and test -TReviewed by: baptDifferential Revision: https://reviews.freebsd.org/D31650 List of files: /src/usr.bin/diff3/tests/Makefile Mon, 23 Aug 2021 19:33:27 +0000 Piotr Pawel Stefaniak <pstef@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#54a3415cb69e1ea0e6533ca3fc168deba64f249f diff3: implement --strip-trailing-crReviewed by: baptDifferential Revision: https://reviews.freebsd.org/D31626 List of files: /src/usr.bin/diff3/tests/Makefile Sat, 21 Aug 2021 00:28:58 +0000 Piotr Pawel Stefaniak <pstef@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/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/tests/Makefile Mon, 15 Jul 2024 04:46:32 +0000 Warner Losh <imp@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#b37a6938e39a7ed9542fafee671465bf719fd537 diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3In gnu diff3 3 way merging files where the new file and the target arealready the same will die and show what has failed to be merged exceptif -E is passed in argument, in this case it will finish the merge.This difference in behaviour was breaking one of the etcupdate testcasewith bsd diff3Reviewed by: emasteDifferential Revision: https://reviews.freebsd.org/D41730 List of files: /src/usr.bin/diff3/tests/Makefile Tue, 05 Sep 2023 11:24:53 +0000 Baptiste Daroussin <bapt@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf Remove $FreeBSD$: one-line sh patternRemove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ List of files: /src/usr.bin/diff3/tests/Makefile Wed, 16 Aug 2023 17:55:03 +0000 Warner Losh <imp@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#034dd2d54f2e7e33897cfd5ede7c50b3d67d18d3 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: /src/usr.bin/diff3/tests/Makefile Tue, 19 Apr 2022 15:20:24 +0000 Tom Jones <thj@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#9ab079c5e81098c81e8b25f26a3b56392eac5463 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: /src/usr.bin/diff3/tests/Makefile Tue, 19 Apr 2022 14:43:35 +0000 Tom Jones <thj@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#7c03df6855f451749501748b98019c8e2d9d9600 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: /src/usr.bin/diff3/tests/Makefile Fri, 15 Apr 2022 13:59:14 +0000 Tom Jones <thj@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#9f7a81b133c715f649136dcd0ad004e4180c56c9 diff3: document and test -TReviewed by: baptDifferential Revision: https://reviews.freebsd.org/D31650 List of files: /src/usr.bin/diff3/tests/Makefile Mon, 23 Aug 2021 19:33:27 +0000 Piotr Pawel Stefaniak <pstef@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#54a3415cb69e1ea0e6533ca3fc168deba64f249f diff3: implement --strip-trailing-crReviewed by: baptDifferential Revision: https://reviews.freebsd.org/D31626 List of files: /src/usr.bin/diff3/tests/Makefile Sat, 21 Aug 2021 00:28:58 +0000 Piotr Pawel Stefaniak <pstef@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#d02c951f8ec631d059ec7a8addb8a104cd160280 Merge ^/head r318658 through r318963. List of files: /src/usr.bin/diff3/tests/Makefile Fri, 26 May 2017 19:11:24 +0000 Dimitry Andric <dim@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/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/tests/Makefile Thu, 25 May 2017 17:45:50 +0000 Baptiste Daroussin <bapt@FreeBSD.org> http://opengrok.net:8080/history/src/usr.bin/diff3/tests/Makefile#d02c951f8ec631d059ec7a8addb8a104cd160280 Merge ^/head r318658 through r318963. List of files: /src/usr.bin/diff3/tests/Makefile Fri, 26 May 2017 19:11:24 +0000 Dimitry Andric <dim@FreeBSD.org>