2014-03-27 18:54:56 +00:00

15 lines
2.7 KiB
HTML
Raw Permalink Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
<html xmlns="http://www.w3.org/1999/xhtml"><head><title>diff</title><link rel="stylesheet" href="../../jargon.css" type="text/css"/><meta name="generator" content="DocBook XSL Stylesheets V1.61.0"/><link rel="home" href="../index.html" title="The Jargon File"/><link rel="up" href="../D.html" title="D"/><link rel="previous" href="die-horribly.html" title="die horribly"/><link rel="next" href="dike.html" title="dike"/></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">diff</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="die-horribly.html">Prev</a> </td><th width="60%" align="center">D</th><td width="20%" align="right"> <a accesskey="n" href="dike.html">Next</a></td></tr></table><hr/></div><dt><a id="diff"/><dt xmlns="" id="diff"><b>diff</b>: <span xmlns="http://www.w3.org/1999/xhtml" class="pronunciation">/dif/</span>, <span xmlns="http://www.w3.org/1999/xhtml" class="grammar">n.</span></dt></dt><dd><p> 1. A change listing, especially giving differences between (and
additions to) source code or documents (the term is often used in the
plural <span class="firstterm">diffs</span>). &#8220;<span class="quote">Send me your
diffs for the Jargon File!</span>&#8221; Compare <a href="../V/vdiff.html"><i class="glossterm">vdiff</i></a>.
</p></dd><dd><p> 2. Specifically, such a listing produced by the
<span class="citerefentry"><span class="refentrytitle">diff</span>(1)</span>
command, esp. when used as specification input to the
<span class="citerefentry"><span class="refentrytitle">patch</span>(1)</span>
utility (which can actually perform the modifications; see
<a href="../P/patch.html"><i class="glossterm">patch</i></a>). This is a common method of distributing
patches and source updates in the Unix/C world. </p></dd><dd><p> 3. <span class="grammar">v.</span> To compare (whether or not
by use of automated tools on machine-readable files); see also
<a href="../V/vdiff.html"><i class="glossterm">vdiff</i></a>, <a href="../M/mod.html"><i class="glossterm">mod</i></a>.</p></dd><div class="navfooter"><hr/><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="die-horribly.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="../D.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="dike.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">die horribly </td><td width="20%" align="center"><a accesskey="h" href="../index.html">Home</a></td><td width="40%" align="right" valign="top"> dike</td></tr></table></div></body></html>