src/usr.bin/diff3/diff3.1, branch releng/14.2FreeBSD source treehttps://cgit-dev.freebsd.org/src/atom?h=releng%2F14.22023-08-16T17:55:15ZRemove $FreeBSD$: one-line nroff pattern2023-08-16T17:55:15ZWarner Loshimp@FreeBSD.org2023-08-16T17:55:15Zurn:sha1:b2c76c41be32f904179efed29c0ca04d53f3996c
Remove /^\.\\"\s*\$FreeBSD\$$\n/
diff3: Add man page description for version and help2022-06-23T12:37:28ZTom Jonesthj@FreeBSD.org2022-06-23T12:37:28Zurn:sha1:26b5deef22ae316646b6bd173414826a9598b666
Reviewed by: Pau Amma
Sponsored by: Klara, Inc.
Differential Revision: https://reviews.freebsd.org/D35325
diff3: Add support for -m2022-04-19T15:20:24ZTom Jonesthj@FreeBSD.org2022-04-19T15:20:24Zurn:sha1:034dd2d54f2e7e33897cfd5ede7c50b3d67d18d3
diff3 in -m mode generates a complete file with changes bracketed with
conflict markers. This adds support for diff3 to generate version
control style three way merge output.
The output format was inferred from looking at the gnu diff3 output on a
selection of test files as a specification of what diff3 -m should
output is not available. It is likely there are cases where the -m
output differs from other tools and I am happy to update diff3 to
address these.
Discussed with: pstef, kevans
Sponsored by: Klara, Inc.
diff3: Add support for -A2022-04-19T14:54:32ZTom Jonesthj@FreeBSD.org2022-04-19T14:43:35Zurn:sha1:9ab079c5e81098c81e8b25f26a3b56392eac5463
Diff3 in -A mode generates an ed script to show how the 3 files and
brackets changes that conflict. The ed script generated should when
applied leave familiar merge conflict markers in a patched file.
Diff3 output is not documented, this feature has been arrived at by
comparing bsd diff3 output to gnu diff3 output until they were made to
agree. There are likely to still be differences between these formats.
The gnu diff3 guide is actually quite good at explaining how diff3
output should appear, but it doesn't cover every form of output from
diff3.
https://www.gnu.org/software/diffutils/manual/diffutils.html#Comparing-Three-Files
Discussed with: pstef, kevans
Sponsored by: Klara, Inc.
diff3: document and test -T2021-08-25T16:20:59ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-23T19:33:27Zurn:sha1:9f7a81b133c715f649136dcd0ad004e4180c56c9
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D31650
diff3: implement --strip-trailing-cr2021-08-23T05:04:28ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-21T00:28:58Zurn:sha1:54a3415cb69e1ea0e6533ca3fc168deba64f249f
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D31626
diff3.1: update manual page to match code2021-08-23T05:04:28ZPiotr Pawel Stefaniakpstef@FreeBSD.org2021-08-20T22:50:05Zurn:sha1:e8ff95356ceaaa941251056e9d0a4211bf428e06Update the diff3 manpage to reflect the fact the version in freebsd does2017-05-25T18:46:13ZBaptiste Daroussinbapt@FreeBSD.org2017-05-25T18:46:13Zurn:sha1:9500abb088b81472d52941ad73f592396a684af8
not use temporary files nor uses a /usr/libexec/diff3prog
Import working progress BSD diff32017-05-25T17:45:50ZBaptiste Daroussinbapt@FreeBSD.org2017-05-25T17:45:50Zurn:sha1:e1910ebda4d5972aef64aaf67ea7bcbbba16fa4f
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