.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. .TH DIFF3 "1" "April 2010" "diffutils 2.9.19-4065" "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\-\-strip\-trailing\-cr\fR Strip trailing carriage return on input. .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. Exit status is 0 if successful, 1 if conflicts, 2 if trouble. .SH AUTHOR Written by Randy Smith. .SH "REPORTING BUGS" Report bugs to: bug\-diffutils@gnu.org GNU diffutils home page: General help using GNU software: .SH COPYRIGHT Copyright \(co 2010 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later . .br This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. .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.