| 1 | .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.27.
|
|---|
| 2 | .TH DIFF3 "1" "April 2002" "diffutils 2.8.1" "User Commands"
|
|---|
| 3 | .SH NAME
|
|---|
| 4 | diff3 \- compare three files line by line
|
|---|
| 5 | .SH SYNOPSIS
|
|---|
| 6 | .B diff3
|
|---|
| 7 | [\fIOPTION\fR]... \fIMYFILE OLDFILE YOURFILE\fR
|
|---|
| 8 | .SH DESCRIPTION
|
|---|
| 9 | Compare three files line by line.
|
|---|
| 10 | .TP
|
|---|
| 11 | \fB\-e\fR \fB\-\-ed\fR
|
|---|
| 12 | Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
|
|---|
| 13 | .TP
|
|---|
| 14 | \fB\-E\fR \fB\-\-show\-overlap\fR
|
|---|
| 15 | Output unmerged changes, bracketing conflicts.
|
|---|
| 16 | .TP
|
|---|
| 17 | \fB\-A\fR \fB\-\-show\-all\fR
|
|---|
| 18 | Output all changes, bracketing conflicts.
|
|---|
| 19 | .TP
|
|---|
| 20 | \fB\-x\fR \fB\-\-overlap\-only\fR
|
|---|
| 21 | Output overlapping changes.
|
|---|
| 22 | .TP
|
|---|
| 23 | \fB\-X\fR
|
|---|
| 24 | Output overlapping changes, bracketing them.
|
|---|
| 25 | .TP
|
|---|
| 26 | \fB\-3\fR \fB\-\-easy\-only\fR
|
|---|
| 27 | Output unmerged nonoverlapping changes.
|
|---|
| 28 | .TP
|
|---|
| 29 | \fB\-m\fR \fB\-\-merge\fR
|
|---|
|
|---|
