diff3 man page on FreeBSD
DIFF3(1) User Commands DIFF3(1)
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>.
Copyright © 2004 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is
NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
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.
diffutils 2.8.7 April 2004 DIFF3(1)
List of man pages available for FreeBSD
Copyright (c) for man pages and the logo by the respective OS vendor.
For those who want to learn more, the polarhome community provides shell access and support.
Polarhome, production since 1999.
Member of Polarhome portal.
Based on Fawad Halim's script.
Vote for polarhome