diff3 - compare three files line by line
diff3 [OPTION]... MYFILE OLDFILE YOURFILE
Compare three files line by line.
Output unmerged changes from OLDFILE to YOURFILE into MYFILE.
Output unmerged changes, bracketing conflicts.
Output all changes, bracketing conflicts.
Output overlapping changes.
-X Output overlapping changes, bracketing them.
Output unmerged nonoverlapping changes.
Output merged file instead of ed script (default -A).
-L LABEL --label=LABEL
Use LABEL instead of file name.
-i Append ‘w’ and ‘q’ commands to ed scripts.
Treat all files as text.
Strip trailing carriage return on input.
Make tabs line up by prepending a tab.
Use PROGRAM to compare files.
Output version info.
--help Output this help.
If a FILE is ‘-’, read standard input. Exit status is 0 if successful,
1 if conflicts, 2 if trouble.
Written by Randy Smith.
Report bugs to: firstname.lastname@example.org GNU diffutils home page:
<http://www.gnu.org/software/diffutils/> General help using GNU
Copyright © 2010 Free Software Foundation, Inc. License GPLv3+: GNU
GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
The full documentation for diff3 is maintained as a Texinfo manual. If
the info and diff3 programs are properly installed at your site, the
should give you access to the complete manual.