Changeset View
Changeset View
Standalone View
Standalone View
usr.bin/diff3/diff3.1
Show All 24 Lines | |||||||||||
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||||||||||
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||||||||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||||||||||
.\" SUCH DAMAGE. | .\" SUCH DAMAGE. | ||||||||||
.\" | .\" | ||||||||||
.\" @(#)diff3.1 8.2 (Berkeley) 4/18/94 | .\" @(#)diff3.1 8.2 (Berkeley) 4/18/94 | ||||||||||
.\" $FreeBSD$ | .\" $FreeBSD$ | ||||||||||
.\" | .\" | ||||||||||
.Dd August 23, 2021 | .Dd March 2, 2022 | ||||||||||
.Dt DIFF3 1 | .Dt DIFF3 1 | ||||||||||
.Os | .Os | ||||||||||
.Sh NAME | .Sh NAME | ||||||||||
.Nm diff3 | .Nm diff3 | ||||||||||
.Nd 3-way differential file comparison | .Nd 3-way differential file comparison | ||||||||||
.Sh SYNOPSIS | .Sh SYNOPSIS | ||||||||||
.Nm diff3 | .Nm diff3 | ||||||||||
.Op Fl 3aEeiTXx | .Op Fl 3aAEeimTXx | ||||||||||
pauamma_gundo.com: If you swap a and A per https://reviews.freebsd.org/D34421#inline-212610, do it here as well. | |||||||||||
.Op Fl Fl diff-program Ar program | .Op Fl Fl diff-program Ar program | ||||||||||
.Op Fl Fl strip-trailing-cr | .Op Fl Fl strip-trailing-cr | ||||||||||
.Op Fl L | Fl Fl label Ar label1 | .Op Fl L | Fl Fl label Ar label1 | ||||||||||
.Op Fl L | Fl Fl label Ar label2 | .Op Fl L | Fl Fl label Ar label2 | ||||||||||
.Op Fl L | Fl Fl label Ar label3 | .Op Fl L | Fl Fl label Ar label3 | ||||||||||
.Ar file1 file2 file3 | .Ar file1 file2 file3 | ||||||||||
.Sh DESCRIPTION | .Sh DESCRIPTION | ||||||||||
The | The | ||||||||||
Show All 18 Lines | |||||||||||
.It Fl 3 , Fl Fl easy-only | .It Fl 3 , Fl Fl easy-only | ||||||||||
Produces an output script suitable for | Produces an output script suitable for | ||||||||||
.Xr ed 1 | .Xr ed 1 | ||||||||||
with changes | with changes | ||||||||||
specific only to | specific only to | ||||||||||
.Ar file3 . | .Ar file3 . | ||||||||||
.It Fl a , Fl Fl text | .It Fl a , Fl Fl text | ||||||||||
Treat all files as ASCII. | Treat all files as ASCII. | ||||||||||
.It Fl A Fl Fl show-all | |||||||||||
kevansUnsubmitted Not Done Inline ActionsA should sort before a kevans: A should sort before a | |||||||||||
Output all changes, bracketing conflicts. | |||||||||||
.It Fl E , Fl Fl show-overlap | .It Fl E , Fl Fl show-overlap | ||||||||||
.It Fl X | .It Fl X | ||||||||||
Similar to | Similar to | ||||||||||
.Fl e | .Fl e | ||||||||||
and | and | ||||||||||
.Fl x , | .Fl x , | ||||||||||
respectively, but treat overlapping changes (i.e., changes that would | respectively, but treat overlapping changes (i.e., changes that would | ||||||||||
be noted with ==== in the normal listing) differently. | be noted with ==== in the normal listing) differently. | ||||||||||
Show All 26 Lines | |||||||||||
.Xr ed 1 | .Xr ed 1 | ||||||||||
commands. | commands. | ||||||||||
.It Fl L , Fl Fl label | .It Fl L , Fl Fl label | ||||||||||
Defines labels to print instead of file names | Defines labels to print instead of file names | ||||||||||
.Ar file1 , | .Ar file1 , | ||||||||||
.Ar file2 | .Ar file2 | ||||||||||
and | and | ||||||||||
.Ar file3 . | .Ar file3 . | ||||||||||
.It Fl m, Fl Fl merge | |||||||||||
Merge output instead of generating ed script (default .FL A) | |||||||||||
debdrupUnsubmitted Not Done Inline Actions
Macros need to go on their own line. debdrup: Macros need to go on their own line. | |||||||||||
.It Fl T, Fl Fl initial-tab | .It Fl T, Fl Fl initial-tab | ||||||||||
In the normal listing, | In the normal listing, | ||||||||||
use a tab instead of two spaces | use a tab instead of two spaces | ||||||||||
at the beginning of each line. | at the beginning of each line. | ||||||||||
In modes that produce an | In modes that produce an | ||||||||||
.Xr ed 1 | .Xr ed 1 | ||||||||||
script, this option changes nothing. | script, this option changes nothing. | ||||||||||
.It Fl x, Fl Fl overlap-only | .It Fl x, Fl Fl overlap-only | ||||||||||
Show All 31 Lines | |||||||||||
.Ar file1 | .Ar file1 | ||||||||||
results in the file: | results in the file: | ||||||||||
.Bd -literal -offset indent | .Bd -literal -offset indent | ||||||||||
lines 1-6 | lines 1-6 | ||||||||||
of file1 | of file1 | ||||||||||
<<<<<<< file1 | <<<<<<< file1 | ||||||||||
lines 7-8 | lines 7-8 | ||||||||||
of file1 | of file1 | ||||||||||
======= | ======= | ||||||||||
Lint: Unresolved merge conflict This syntax indicates there is an unresolved merge conflict. Lint: Unresolved merge conflict: This syntax indicates there is an unresolved merge conflict. | |||||||||||
lines 7-8 | lines 7-8 | ||||||||||
of file3 | of file3 | ||||||||||
>>>>>>> file3 | >>>>>>> file3 | ||||||||||
rest of file1 | rest of file1 | ||||||||||
.Ed | .Ed | ||||||||||
.Pp | .Pp | ||||||||||
The default output of | The default output of | ||||||||||
.Nm | .Nm | ||||||||||
Show All 40 Lines |
If you swap a and A per https://reviews.freebsd.org/D34421#inline-212610, do it here as well.