/usr/share/doc/diffutils-doc/diffutils.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 | <!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: Comparing and Merging Files</title>
<meta name="description" content="Comparing and Merging Files: Comparing and Merging Files">
<meta name="keywords" content="Comparing and Merging Files: Comparing and Merging Files">
<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="Top"></a>
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#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="Comparing-and-Merging-Files"></a>
<h1 class="settitle">Comparing and Merging Files</h1>
<p>This manual is for GNU Diffutils
(version 3.2, 15 August 2011),
and documents the <acronym>GNU</acronym> <code>diff</code>, <code>diff3</code>,
<code>sdiff</code>, and <code>cmp</code> commands for showing the
differences between files and the <acronym>GNU</acronym> <code>patch</code> command for
using their output to update files.
</p>
<p>Copyright © 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2011 Free
Software Foundation, Inc.
</p>
<blockquote><p>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
“<acronym>GNU</acronym> Free Documentation License.”
</p></blockquote>
<table class="menu" border="0" cellspacing="0">
<tr><td align="left" valign="top"><a href="diffutils_1.html#Overview">Overview</a></td><td> </td><td align="left" valign="top"> Preliminary information.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_2.html#Comparison">1. What Comparison Means</a></td><td> </td><td align="left" valign="top"> What file comparison means.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_3.html#Output-Formats">2. <code>diff</code> Output Formats</a></td><td> </td><td align="left" valign="top"> Formats for two-way difference reports.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_4.html#Incomplete-Lines">3. Incomplete Lines</a></td><td> </td><td align="left" valign="top"> Lines that lack trailing newlines.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_5.html#Comparing-Directories">4. Comparing Directories</a></td><td> </td><td align="left" valign="top"> Comparing files and directories.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_6.html#Adjusting-Output">5. Making <code>diff</code> Output Prettier</a></td><td> </td><td align="left" valign="top"> Making <code>diff</code> output prettier.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_7.html#diff-Performance">6. <code>diff</code> Performance Tradeoffs</a></td><td> </td><td align="left" valign="top"> Making <code>diff</code> smarter or faster.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_8.html#Comparing-Three-Files">7. Comparing Three Files</a></td><td> </td><td align="left" valign="top"> Formats for three-way difference reports.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_9.html#diff3-Merging">8. Merging From a Common Ancestor</a></td><td> </td><td align="left" valign="top"> Merging from a common ancestor.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_10.html#Interactive-Merging">9. Interactive Merging with <code>sdiff</code></a></td><td> </td><td align="left" valign="top"> Interactive merging with <code>sdiff</code>.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_11.html#Merging-with-patch">10. Merging with <code>patch</code></a></td><td> </td><td align="left" valign="top"> Using <code>patch</code> to change old files into new ones.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_12.html#Making-Patches">11. Tips for Making and Using Patches</a></td><td> </td><td align="left" valign="top"> Tips for making and using patch distributions.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_13.html#Invoking-cmp">12. Invoking <code>cmp</code></a></td><td> </td><td align="left" valign="top"> Compare two files byte by byte.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_14.html#Invoking-diff">13. Invoking <code>diff</code></a></td><td> </td><td align="left" valign="top"> Compare two files line by line.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_15.html#Invoking-diff3">14. Invoking <code>diff3</code></a></td><td> </td><td align="left" valign="top"> Compare three files line by line.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_16.html#Invoking-patch">15. Invoking <code>patch</code></a></td><td> </td><td align="left" valign="top"> Apply a diff file to an original.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_17.html#Invoking-sdiff">16. Invoking <code>sdiff</code></a></td><td> </td><td align="left" valign="top"> Side-by-side merge of file differences.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_18.html#Standards-conformance">17. Standards conformance</a></td><td> </td><td align="left" valign="top"> Conformance to the <acronym>POSIX</acronym> standard.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_19.html#Projects">18. Future Projects</a></td><td> </td><td align="left" valign="top"> If you’ve found a bug or other shortcoming.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_20.html#Copying-This-Manual">A. Copying This Manual</a></td><td> </td><td align="left" valign="top"> How to make copies of this manual.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_21.html#Translations">B. Translations of This Manual</a></td><td> </td><td align="left" valign="top"> Available translations of this manual.
</td></tr>
<tr><td align="left" valign="top"><a href="diffutils_22.html#Index">C. Index</a></td><td> </td><td align="left" valign="top"></td></tr>
</table>
<hr size="1">
<table cellpadding="1" cellspacing="1" border="0">
<tr><td valign="middle" align="left">[<a href="#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>
|