145 lines
4.2 KiB
HTML
145 lines
4.2 KiB
HTML
|
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
|
<HTML><HEAD><TITLE>Man page of GNU</TITLE>
|
|
</HEAD><BODY>
|
|
<H1>GNU</H1>
|
|
Section: User Commands (1)<BR>Updated: December 2018<BR><A HREF="#index">Index</A>
|
|
<A HREF="/cgi-bin/man/man2html">Return to Main Contents</A><HR>
|
|
|
|
<A NAME="lbAB"> </A>
|
|
<H2>NAME</H2>
|
|
|
|
GNU diff3 - compare three files line by line
|
|
<A NAME="lbAC"> </A>
|
|
<H2>SYNOPSIS</H2>
|
|
|
|
<B>diff3</B>
|
|
|
|
[<I>OPTION</I>]... <I>MYFILE OLDFILE YOURFILE</I>
|
|
<A NAME="lbAD"> </A>
|
|
<H2>DESCRIPTION</H2>
|
|
|
|
Compare three files line by line.
|
|
<P>
|
|
|
|
Mandatory arguments to long options are mandatory for short options too.
|
|
<DL COMPACT>
|
|
<DT id="1"><B>-A</B>, <B>--show-all</B><DD>
|
|
output all changes, bracketing conflicts
|
|
<DT id="2"><B>-e</B>, <B>--ed</B><DD>
|
|
output ed script incorporating changes
|
|
from OLDFILE to YOURFILE into MYFILE
|
|
<DT id="3"><B>-E</B>, <B>--show-overlap</B><DD>
|
|
like <B>-e</B>, but bracket conflicts
|
|
<DT id="4"><B>-3</B>, <B>--easy-only</B><DD>
|
|
like <B>-e</B>, but incorporate only nonoverlapping changes
|
|
<DT id="5"><B>-x</B>, <B>--overlap-only</B><DD>
|
|
like <B>-e</B>, but incorporate only overlapping changes
|
|
<DT id="6"><B>-X</B><DD>
|
|
like <B>-x</B>, but bracket conflicts
|
|
<DT id="7"><B>-i</B><DD>
|
|
append 'w' and 'q' commands to ed scripts
|
|
<DT id="8"><B>-m</B>, <B>--merge</B><DD>
|
|
output actual merged file, according to
|
|
<B>-A</B> if no other options are given
|
|
<DT id="9"><B>-a</B>, <B>--text</B><DD>
|
|
treat all files as text
|
|
<DT id="10"><B>--strip-trailing-cr</B><DD>
|
|
strip trailing carriage return on input
|
|
<DT id="11"><B>-T</B>, <B>--initial-tab</B><DD>
|
|
make tabs line up by prepending a tab
|
|
<DT id="12"><B>--diff-program</B>=<I>PROGRAM</I><DD>
|
|
use PROGRAM to compare files
|
|
<DT id="13"><B>-L</B>, <B>--label</B>=<I>LABEL</I><DD>
|
|
use LABEL instead of file name
|
|
(can be repeated up to three times)
|
|
<DT id="14"><B>--help</B><DD>
|
|
display this help and exit
|
|
<DT id="15"><B>-v</B>, <B>--version</B><DD>
|
|
output version information and exit
|
|
</DL>
|
|
<P>
|
|
|
|
The default output format is a somewhat human-readable representation of
|
|
the changes.
|
|
<P>
|
|
|
|
The <B>-e</B>, <B>-E</B>, <B>-x</B>, <B>-X</B> (and corresponding long) options cause an ed script
|
|
to be output instead of the default.
|
|
<P>
|
|
|
|
Finally, the <B>-m</B> (<B>--merge</B>) option causes diff3 to do the merge internally
|
|
and output the actual merged file. For unusual input, this is more
|
|
robust than using ed.
|
|
<P>
|
|
|
|
If a FILE is '-', read standard input.
|
|
Exit status is 0 if successful, 1 if conflicts, 2 if trouble.
|
|
<A NAME="lbAE"> </A>
|
|
<H2>AUTHOR</H2>
|
|
|
|
Written by Randy Smith.
|
|
<A NAME="lbAF"> </A>
|
|
<H2>REPORTING BUGS</H2>
|
|
|
|
Report bugs to: <A HREF="mailto:bug-diffutils@gnu.org">bug-diffutils@gnu.org</A>
|
|
<BR>
|
|
|
|
GNU diffutils home page: <<A HREF="https://www.gnu.org/software/diffutils/">https://www.gnu.org/software/diffutils/</A>>
|
|
<BR>
|
|
|
|
General help using GNU software: <<A HREF="https://www.gnu.org/gethelp/">https://www.gnu.org/gethelp/</A>>
|
|
<A NAME="lbAG"> </A>
|
|
<H2>COPYRIGHT</H2>
|
|
|
|
Copyright © 2018 Free Software Foundation, Inc.
|
|
License GPLv3+: GNU GPL version 3 or later <<A HREF="https://gnu.org/licenses/gpl.html">https://gnu.org/licenses/gpl.html</A>>.
|
|
<BR>
|
|
|
|
This is free software: you are free to change and redistribute it.
|
|
There is NO WARRANTY, to the extent permitted by law.
|
|
<A NAME="lbAH"> </A>
|
|
<H2>SEE ALSO</H2>
|
|
|
|
<A HREF="/cgi-bin/man/man2html?1+cmp">cmp</A>(1), <A HREF="/cgi-bin/man/man2html?1+diff">diff</A>(1), <A HREF="/cgi-bin/man/man2html?1+sdiff">sdiff</A>(1)
|
|
<P>
|
|
|
|
The full documentation for
|
|
<B>GNU</B>
|
|
|
|
is maintained as a Texinfo manual. If the
|
|
<B>info</B>
|
|
|
|
and
|
|
<B>GNU</B>
|
|
|
|
programs are properly installed at your site, the command
|
|
<DL COMPACT>
|
|
<DT id="16"><DD>
|
|
<B>info GNU</B>
|
|
|
|
</DL>
|
|
<P>
|
|
|
|
should give you access to the complete manual.
|
|
<P>
|
|
|
|
<HR>
|
|
<A NAME="index"> </A><H2>Index</H2>
|
|
<DL>
|
|
<DT id="17"><A HREF="#lbAB">NAME</A><DD>
|
|
<DT id="18"><A HREF="#lbAC">SYNOPSIS</A><DD>
|
|
<DT id="19"><A HREF="#lbAD">DESCRIPTION</A><DD>
|
|
<DT id="20"><A HREF="#lbAE">AUTHOR</A><DD>
|
|
<DT id="21"><A HREF="#lbAF">REPORTING BUGS</A><DD>
|
|
<DT id="22"><A HREF="#lbAG">COPYRIGHT</A><DD>
|
|
<DT id="23"><A HREF="#lbAH">SEE ALSO</A><DD>
|
|
</DL>
|
|
<HR>
|
|
This document was created by
|
|
<A HREF="/cgi-bin/man/man2html">man2html</A>,
|
|
using the manual pages.<BR>
|
|
Time: 00:05:11 GMT, March 31, 2021
|
|
</BODY>
|
|
</HTML>
|