/usr/share/doc/diffutils-doc/diffutils_15.html is in diffutils-doc 1:3.2-6.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 | <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
<html>
<!-- This manual is for GNU Diffutils
(version 3.2, 15 August 2011),
and documents the GNU diff, diff3,
sdiff, and cmp commands for showing the
differences between files and the GNU patch command for
using their output to update files.
Copyright C 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2011 Free
Software Foundation, Inc.
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.3 or
any later version published by the Free Software Foundation; with no
Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
A copy of the license is included in the section entitled
"GNU Free Documentation License."
-->
<!-- Created on April 29, 2012 by texi2html 1.82
texi2html was written by:
Lionel Cons <Lionel.Cons@cern.ch> (original author)
Karl Berry <karl@freefriends.org>
Olaf Bachmann <obachman@mathematik.uni-kl.de>
and many others.
Maintained by: Many creative people.
Send bugs and suggestions to <texi2html-bug@nongnu.org>
-->
<head>
<title>Comparing and Merging Files: 14. Invoking diff3</title>
<meta name="description" content="Comparing and Merging Files: 14. Invoking diff3">
<meta name="keywords" content="Comparing and Merging Files: 14. Invoking diff3">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2html 1.82">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
blockquote.smallquotation {font-size: smaller}
pre.display {font-family: serif}
pre.format {font-family: serif}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
pre.smalldisplay {font-family: serif; font-size: smaller}
pre.smallexample {font-size: smaller}
pre.smallformat {font-family: serif; font-size: smaller}
pre.smalllisp {font-size: smaller}
span.roman {font-family:serif; font-weight:normal;}
span.sansserif {font-family:sans-serif; font-weight:normal;}
ul.toc {list-style: none}
-->
</style>
</head>
<body lang="en" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080" alink="#FF0000">
<a name="Invoking-diff3"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="diffutils_14.html#diff-Options" title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="#diff3-Options" title="Next section in reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left">[<a href="diffutils_14.html#Invoking-diff" title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="diffutils.html#Top" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="diffutils_16.html#Invoking-patch" title="Next chapter"> >> </a>]</td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left">[<a href="diffutils.html#Top" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="diffutils_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="diffutils_22.html#Index" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="diffutils_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<a name="Invoking-diff3-1"></a>
<h1 class="chapter">14. Invoking <code>diff3</code></h1>
<a name="index-invoking-diff3"></a>
<a name="index-diff3-invocation"></a>
<p>The <code>diff3</code> command compares three files and outputs descriptions
of their differences. Its arguments are as follows:
</p>
<table><tr><td> </td><td><pre class="example">diff3 <var>options</var>… <var>mine</var> <var>older</var> <var>yours</var>
</pre></td></tr></table>
<p>The files to compare are <var>mine</var>, <var>older</var>, and <var>yours</var>.
At most one of these three file names may be ‘<tt>-</tt>’,
which tells <code>diff3</code> to read the standard input for that file.
</p>
<p>An exit status of 0 means <code>diff3</code> was successful, 1 means some
conflicts were found, and 2 means trouble.
</p>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="#diff3-Options">14.1 Options to <code>diff3</code></a></td><td> </td><td align="left" valign="top"> Summary of options to <code>diff3</code>.
</td></tr>
</table>
<hr size="6">
<a name="diff3-Options"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Invoking-diff3" title="Previous section in reading order"> < </a>]</td>
<td valign="middle" align="left">[<a href="diffutils_16.html#Invoking-patch" title="Next section in reading order"> > </a>]</td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left">[<a href="#Invoking-diff3" title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="#Invoking-diff3" title="Up section"> Up </a>]</td>
<td valign="middle" align="left">[<a href="diffutils_16.html#Invoking-patch" title="Next chapter"> >> </a>]</td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left">[<a href="diffutils.html#Top" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="diffutils_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="diffutils_22.html#Index" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="diffutils_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<a name="Options-to-diff3"></a>
<h2 class="section">14.1 Options to <code>diff3</code></h2>
<a name="index-diff3-options"></a>
<a name="index-options-for-diff3"></a>
<p>Below is a summary of all of the options that <acronym>GNU</acronym> <code>diff3</code>
accepts. Multiple single letter options (unless they take an argument)
can be combined into a single command line argument.
</p>
<dl compact="compact">
<dt> ‘<samp>-a</samp>’</dt>
<dt> ‘<samp>--text</samp>’</dt>
<dd><p>Treat all files as text and compare them line-by-line, even if they
do not appear to be text. See section <a href="diffutils_2.html#Binary">Binary Files and Forcing Text Comparisons</a>.
</p>
</dd>
<dt> ‘<samp>-A</samp>’</dt>
<dt> ‘<samp>--show-all</samp>’</dt>
<dd><p>Incorporate all unmerged changes from <var>older</var> to <var>yours</var> into
<var>mine</var>, surrounding conflicts with bracket lines.
See section <a href="diffutils_9.html#Marking-Conflicts">Marking Conflicts</a>.
</p>
</dd>
<dt> ‘<samp>--diff-program=<var>program</var></samp>’</dt>
<dd><p>Use the compatible comparison program <var>program</var> to compare files
instead of <code>diff</code>.
</p>
</dd>
<dt> ‘<samp>-e</samp>’</dt>
<dt> ‘<samp>--ed</samp>’</dt>
<dd><p>Generate an <code>ed</code> script that incorporates all the changes from
<var>older</var> to <var>yours</var> into <var>mine</var>. See section <a href="diffutils_9.html#Which-Changes">Selecting Which Changes to Incorporate</a>.
</p>
</dd>
<dt> ‘<samp>-E</samp>’</dt>
<dt> ‘<samp>--show-overlap</samp>’</dt>
<dd><p>Like ‘<samp>-e</samp>’, except bracket lines from overlapping changes’ first
and third files.
See section <a href="diffutils_9.html#Marking-Conflicts">Marking Conflicts</a>.
With ‘<samp>-E</samp>’, an overlapping change looks like this:
</p>
<table><tr><td> </td><td><pre class="example"><<<<<<< <var>mine</var>
<span class="roman">lines from <var>mine</var></span>
=======
<span class="roman">lines from <var>yours</var></span>
>>>>>>> <var>yours</var>
</pre></td></tr></table>
</dd>
<dt> ‘<samp>--help</samp>’</dt>
<dd><p>Output a summary of usage and then exit.
</p>
</dd>
<dt> ‘<samp>-i</samp>’</dt>
<dd><p>Generate ‘<samp>w</samp>’ and ‘<samp>q</samp>’ commands at the end of the <code>ed</code>
script for System V compatibility. This option must be combined with
one of the ‘<samp>-AeExX3</samp>’ options, and may not be combined with ‘<samp>-m</samp>’.
See section <a href="diffutils_9.html#Saving-the-Changed-File">Saving the Changed File</a>.
</p>
</dd>
<dt> ‘<samp>--label=<var>label</var></samp>’</dt>
<dd><p>Use the label <var>label</var> for the brackets output by the ‘<samp>-A</samp>’,
‘<samp>-E</samp>’ and ‘<samp>-X</samp>’ options. This option may be given up to three
times, one for each input file. The default labels are the names of
the input files. Thus ‘<samp>diff3 --label X --label Y --label Z -m A
B C</samp>’ acts like
‘<samp>diff3 -m A B C</samp>’, except that the output looks like it came from
files named ‘<samp>X</samp>’, ‘<samp>Y</samp>’ and ‘<samp>Z</samp>’ rather than from files
named ‘<samp>A</samp>’, ‘<samp>B</samp>’ and ‘<samp>C</samp>’. See section <a href="diffutils_9.html#Marking-Conflicts">Marking Conflicts</a>.
</p>
</dd>
<dt> ‘<samp>-m</samp>’</dt>
<dt> ‘<samp>--merge</samp>’</dt>
<dd><p>Apply the edit script to the first file and send the result to standard
output. Unlike piping the output from <code>diff3</code> to <code>ed</code>, this
works even for binary files and incomplete lines. ‘<samp>-A</samp>’ is assumed
if no edit script option is specified. See section <a href="diffutils_9.html#Bypassing-ed">Generating the Merged Output Directly</a>.
</p>
</dd>
<dt> ‘<samp>--strip-trailing-cr</samp>’</dt>
<dd><p>Strip any trailing carriage return at the end of an input line.
See section <a href="diffutils_2.html#Binary">Binary Files and Forcing Text Comparisons</a>.
</p>
</dd>
<dt> ‘<samp>-T</samp>’</dt>
<dt> ‘<samp>--initial-tab</samp>’</dt>
<dd><p>Output a tab rather than two spaces before the text of a line in normal format.
This causes the alignment of tabs in the line to look normal. See section <a href="diffutils_6.html#Tabs">Preserving Tab Stop Alignment</a>.
</p>
</dd>
<dt> ‘<samp>-v</samp>’</dt>
<dt> ‘<samp>--version</samp>’</dt>
<dd><p>Output version information and then exit.
</p>
</dd>
<dt> ‘<samp>-x</samp>’</dt>
<dt> ‘<samp>--overlap-only</samp>’</dt>
<dd><p>Like ‘<samp>-e</samp>’, except output only the overlapping changes.
See section <a href="diffutils_9.html#Which-Changes">Selecting Which Changes to Incorporate</a>.
</p>
</dd>
<dt> ‘<samp>-X</samp>’</dt>
<dd><p>Like ‘<samp>-E</samp>’, except output only the overlapping changes.
In other words, like ‘<samp>-x</samp>’, except bracket changes as in ‘<samp>-E</samp>’.
See section <a href="diffutils_9.html#Marking-Conflicts">Marking Conflicts</a>.
</p>
</dd>
<dt> ‘<samp>-3</samp>’</dt>
<dt> ‘<samp>--easy-only</samp>’</dt>
<dd><p>Like ‘<samp>-e</samp>’, except output only the nonoverlapping changes.
See section <a href="diffutils_9.html#Which-Changes">Selecting Which Changes to Incorporate</a>.
</p></dd>
</dl>
<hr size="6">
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#Invoking-diff3" title="Beginning of this chapter or previous chapter"> << </a>]</td>
<td valign="middle" align="left">[<a href="diffutils_16.html#Invoking-patch" title="Next chapter"> >> </a>]</td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left"> </td>
<td valign="middle" align="left">[<a href="diffutils.html#Top" title="Cover (top) of document">Top</a>]</td>
<td valign="middle" align="left">[<a href="diffutils_toc.html#SEC_Contents" title="Table of contents">Contents</a>]</td>
<td valign="middle" align="left">[<a href="diffutils_22.html#Index" title="Index">Index</a>]</td>
<td valign="middle" align="left">[<a href="diffutils_abt.html#SEC_About" title="About (help)"> ? </a>]</td>
</tr></table>
<p>
<font size="-1">
This document was generated by <em>root</em> on <em>April 29, 2012</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.
</font>
<br>
</p>
</body>
</html>
|