/usr/share/doc/diffutils-doc/Overview.html

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<!-- This manual is for GNU Diffutils
(version 3.6, 6 May 2017),
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-2017 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 by GNU Texinfo 6.4.90, http://www.gnu.org/software/texinfo/ -->
<head>
<title>Overview (Comparing and Merging Files)</title>

<meta name="description" content="Overview (Comparing and Merging Files)">
<meta name="keywords" content="Overview (Comparing and Merging Files)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="makeinfo">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="index.html#Top" rel="start" title="Top">
<link href="Index.html#Index" rel="index" title="Index">
<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
<link href="index.html#Top" rel="up" title="Top">
<link href="Comparison.html#Comparison" rel="next" title="Comparison">
<link href="index.html#Top" rel="prev" title="Top">
<style type="text/css">
<!--
a.summary-letter {text-decoration: none}
blockquote.indentedblock {margin-right: 0em}
blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
blockquote.smallquotation {font-size: smaller}
div.display {margin-left: 3.2em}
div.example {margin-left: 3.2em}
div.lisp {margin-left: 3.2em}
div.smalldisplay {margin-left: 3.2em}
div.smallexample {margin-left: 3.2em}
div.smalllisp {margin-left: 3.2em}
kbd {font-style: oblique}
pre.display {font-family: inherit}
pre.format {font-family: inherit}
pre.menu-comment {font-family: serif}
pre.menu-preformatted {font-family: serif}
pre.smalldisplay {font-family: inherit; font-size: smaller}
pre.smallexample {font-size: smaller}
pre.smallformat {font-family: inherit; font-size: smaller}
pre.smalllisp {font-size: smaller}
span.nolinebreak {white-space: nowrap}
span.roman {font-family: initial; font-weight: normal}
span.sansserif {font-family: sans-serif; font-weight: normal}
ul.no-bullet {list-style: none}
-->
</style>


</head>

<body lang="en">
<a name="Overview"></a>
<div class="header">
<p>
Next: <a href="Comparison.html#Comparison" accesskey="n" rel="next">Comparison</a>, Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html#Index" title="Index" rel="index">Index</a>]</p>
</div>
<a name="Overview-1"></a>
<h2 class="unnumbered">Overview</h2>
<a name="index-overview-of-diff-and-patch"></a>

<p>Computer users often find occasion to ask how two files differ.  Perhaps
one file is a newer version of the other file.  Or maybe the two files
started out as identical copies but were changed by different people.
</p>
<p>You can use the <code>diff</code> command to show differences between two
files, or each corresponding file in two directories.  <code>diff</code>
outputs differences between files line by line in any of several
formats, selectable by command line options.  This set of differences is
often called a <em>diff</em> or <em>patch</em>.  For files that are identical,
<code>diff</code> normally produces no output; for binary (non-text) files,
<code>diff</code> normally reports only that they are different.
</p>
<p>You can use the <code>cmp</code> command to show the byte and line numbers
where two files differ.  <code>cmp</code> can also show all the bytes
that differ between the two files, side by side.  A way to compare
two files character by character is the Emacs command <kbd>M-x
compare-windows</kbd>.  See <a href="http://www.gnu.org/software/emacs/manual/html_node/emacs/Other-Window.html#Other-Window">Other Window</a> in <cite>The GNU
Emacs Manual</cite>, for more information on that command.
</p>
<p>You can use the <code>diff3</code> command to show differences among three
files.  When two people have made independent changes to a common
original, <code>diff3</code> can report the differences between the original
and the two changed versions, and can produce a merged file that
contains both persons&rsquo; changes together with warnings about conflicts.
</p>
<p>You can use the <code>sdiff</code> command to merge two files interactively.
</p>
<p>You can use the set of differences produced by <code>diff</code> to distribute
updates to text files (such as program source code) to other people.
This method is especially useful when the differences are small compared
to the complete files.  Given <code>diff</code> output, you can use the
<code>patch</code> program to update, or <em>patch</em>, a copy of the file.  If you
think of <code>diff</code> as subtracting one file from another to produce
their difference, you can think of <code>patch</code> as adding the difference
to one file to reproduce the other.
</p>
<p>This manual first concentrates on making diffs, and later shows how to
use diffs to update files.
</p>
<p>GNU <code>diff</code> was written by Paul Eggert, Mike Haertel,
David Hayes, Richard Stallman, and Len Tower.  Wayne Davison designed and
implemented the unified output format.  The basic algorithm is described
by Eugene W. Myers in &ldquo;An O(ND) Difference Algorithm and its Variations&rdquo;,
<cite>Algorithmica</cite> Vol. 1, 1986, pp. 251&ndash;266,
<a href="http://dx.doi.org/10.1007/BF01840446">http://dx.doi.org/10.1007/BF01840446</a>; and in &ldquo;A File
Comparison Program&rdquo;, Webb Miller and Eugene W. Myers,
<cite>Software&mdash;Practice and Experience</cite> Vol. 15, 1985,
pp. 1025&ndash;1040,
<a href="http://dx.doi.org/10.1002/spe.4380151102">http://dx.doi.org/10.1002/spe.4380151102</a>.
The algorithm was independently discovered as described by Esko Ukkonen in
&ldquo;Algorithms for Approximate String Matching&rdquo;,
<cite>Information and Control</cite> Vol. 64, 1985, pp. 100&ndash;118,
<a href="http://dx.doi.org/10.1016/S0019-9958(85)80046-2">http://dx.doi.org/10.1016/S0019-9958(85)80046-2</a>.
Unless the <samp>--minimal</samp> option is used, <code>diff</code> uses a
heuristic by Paul Eggert that limits the cost to <em>O(N^1.5 log N)</em>
at the price of producing suboptimal output for large inputs with many
differences.  Related algorithms are surveyed by Alfred V. Aho in
section 6.3 of &ldquo;Algorithms for Finding Patterns in Strings&rdquo;,
<cite>Handbook of Theoretical Computer Science</cite> (Jan Van Leeuwen,
ed.), Vol. A, <cite>Algorithms and Complexity</cite>, Elsevier/MIT Press,
1990, pp. 255&ndash;300.
</p>
<p>GNU <code>diff3</code> was written by Randy Smith.  GNU
<code>sdiff</code> was written by Thomas Lord.  GNU <code>cmp</code>
was written by Torbj&ouml;rn Granlund and David MacKenzie.
</p>
<p>GNU <code>patch</code> was written mainly by Larry Wall and Paul Eggert;
several GNU enhancements were contributed by Wayne Davison and
David MacKenzie.  Parts of this manual are adapted from a manual page
written by Larry Wall, with his permission.
</p>
<hr>
<div class="header">
<p>
Next: <a href="Comparison.html#Comparison" accesskey="n" rel="next">Comparison</a>, Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html#Index" title="Index" rel="index">Index</a>]</p>
</div>



</body>
</html>
diffutils-doc 1:3.6-1 / usr / share / doc / diffutils-doc / Overview.html
