Compare three files line by line.
Mandatory arguments to long options are mandatory for short options
output all changes, bracketing conflicts
output ed script incorporating changes from OLDFILE to
YOURFILE into MYFILE
like -e, but bracket conflicts
like -e, but incorporate only nonoverlapping changes
like -e, but incorporate only overlapping changes
-X like -x, but bracket conflicts
-i append 'w' and 'q' commands to ed scripts
output actual merged file, according to -A if no other options
treat all files as text
strip trailing carriage return on input
make tabs line up by prepending a tab
use PROGRAM to compare files
use LABEL instead of file name (can be repeated up to three
--help display this help and exit
output version information and exit
The default output format is a somewhat human-readable representation
of the changes.
The -e, -E, -x, -X (and corresponding long) options cause an ed
script to be output instead of the default.
Finally, the -m (--merge) option causes diff3 to do the merge
internally and output the actual merged file. For unusual input,
this is more robust than using ed.
If a FILE is '-', read standard input. Exit status is 0 if
successful, 1 if conflicts, 2 if trouble.
cmp(1), diff(1), sdiff(1)
The full documentation for diff3 is maintained as a Texinfo manual.
If the info and diff3 programs are properly installed at your site,
should give you access to the complete manual.
This page is part of the diffutils (GNU diff utilities) project.
Information about the project can be found at
⟨http://savannah.gnu.org/projects/diffutils/⟩. If you have a bug
report for this manual page, send it to email@example.com. This
page was obtained from the project's upstream Git repository
⟨git://git.savannah.gnu.org/diffutils.git⟩ on 2017-03-13. If you dis‐
cover any rendering problems in this HTML version of the page, or you
believe there is a better or more up-to-date source for the page, or
you have corrections or improvements to the information in this
COLOPHON (which is not part of the original manual page), send a mail
diffutils 3.5.17-198c-dirty February 2017 DIFF3(1)