- NetBSD Manual Pages
DIFF3(1) User Commands DIFF3(1)
Powered by man-cgi (2021-06-01).
Maintained for NetBSD
by Kimmo Suominen.
Based on man-cgi by Panagiotis Christias.
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.
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.
Written by Randy Smith.
Report bugs to <email@example.com>.
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.
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.1 April 2002 DIFF3(1)