diff options
Diffstat (limited to 'gnu/dist/diffutils/man/diff3.1')
| -rw-r--r-- | gnu/dist/diffutils/man/diff3.1 | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/gnu/dist/diffutils/man/diff3.1 b/gnu/dist/diffutils/man/diff3.1 deleted file mode 100644 index c07bd067c6b..00000000000 --- a/gnu/dist/diffutils/man/diff3.1 +++ /dev/null @@ -1,78 +0,0 @@ -.\" $NetBSD: diff3.1,v 1.1.1.1 2003/01/26 00:43:17 wiz Exp $ -.\" -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.27. -.TH DIFF3 "1" "April 2002" "diffutils 2.8.1" "User Commands" -.SH NAME -diff3 \- compare three files line by line -.SH SYNOPSIS -.B diff3 -[\fIOPTION\fR]... \fIMYFILE OLDFILE YOURFILE\fR -.SH DESCRIPTION -Compare three files line by line. -.TP -\fB\-e\fR \fB\-\-ed\fR -Output unmerged changes from OLDFILE to YOURFILE into MYFILE. -.TP -\fB\-E\fR \fB\-\-show\-overlap\fR -Output unmerged changes, bracketing conflicts. -.TP -\fB\-A\fR \fB\-\-show\-all\fR -Output all changes, bracketing conflicts. -.TP -\fB\-x\fR \fB\-\-overlap\-only\fR -Output overlapping changes. -.TP -\fB\-X\fR -Output overlapping changes, bracketing them. -.TP -\fB\-3\fR \fB\-\-easy\-only\fR -Output unmerged nonoverlapping changes. -.TP -\fB\-m\fR \fB\-\-merge\fR -Output merged file instead of ed script (default \fB\-A\fR). -.TP -\fB\-L\fR LABEL \fB\-\-label\fR=\fILABEL\fR -Use LABEL instead of file name. -.TP -\fB\-i\fR -Append `w' and `q' commands to ed scripts. -.TP -\fB\-a\fR \fB\-\-text\fR -Treat all files as text. -.TP -\fB\-T\fR \fB\-\-initial\-tab\fR -Make tabs line up by prepending a tab. -.TP -\fB\-\-diff\-program\fR=\fIPROGRAM\fR -Use PROGRAM to compare files. -.TP -\fB\-v\fR \fB\-\-version\fR -Output version info. -.TP -\fB\-\-help\fR -Output this help. -.PP -If a FILE is `-', read standard input. -.SH AUTHOR -Written by Randy Smith. -.SH "REPORTING BUGS" -Report bugs to <bug-gnu-utils@gnu.org>. -.SH COPYRIGHT -Copyright \(co 2002 Free Software Foundation, Inc. -.PP -This program comes with NO WARRANTY, to the extent permitted by law. -You may redistribute copies of this program -under the terms of the GNU General Public License. -For more information about these matters, see the file named COPYING. -.SH "SEE ALSO" -The full documentation for -.B diff3 -is maintained as a Texinfo manual. If the -.B info -and -.B diff3 -programs are properly installed at your site, the command -.IP -.B info diff -.PP -should give you access to the complete manual. |
