NAME

diff3 - compare three files line by line

SYNOPSIS

diff3 [_O_P_T_I_O_N]... _M_Y_F_I_L_E _O_L_D_F_I_L_E _Y_O_U_R_F_I_L_E

DESCRIPTION

Compare three files line by line.
--ee ----eedd
Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
--EE ----sshhooww--oovveerrllaapp
Output unmerged changes, bracketing conflicts.
--AA ----sshhooww--aallll
Output all changes, bracketing conflicts.
--xx ----oovveerrllaapp--oonnllyy
Output overlapping changes.
--XX
Output overlapping changes, bracketing them.
--33 ----eeaassyy--oonnllyy
Output unmerged nonoverlapping changes.
--mm ----mmeerrggee
Output merged file instead of ed script (default --AA).
--LL LABEL ----llaabbeell=_L_A_B_E_L
Use LABEL instead of file name.
--ii
Append `w' and `q' commands to ed scripts.
--aa ----tteexxtt
Treat all files as text.
--TT ----iinniittiiaall--ttaabb
Make tabs line up by prepending a tab.
----ddiiffff--pprrooggrraamm=_P_R_O_G_R_A_M
Use PROGRAM to compare files.
--vv ----vveerrssiioonn
Output version info.
----hheellpp
Output this help.

If a FILE is `-', read standard input.

AUTHOR

Written by Randy Smith.

REPORTING BUGS

Report bugs to . Copyright © 2002 Free Software Foundation, Inc.

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.

SEE ALSO

The full documentation for diff3 is maintained as a Texinfo manual. If the info and diff3 programs are properly installed at your site, the command
info diff

should give you access to the complete manual.