74 lines
1.2 KiB
HTML
74 lines
1.2 KiB
HTML
<HTML>
|
|
<HEAD>
|
|
<TITLE>cdiff(1)</TITLE>
|
|
</HEAD>
|
|
<BODY>
|
|
<H1>cdiff(1)</H1>
|
|
<HR>
|
|
<PRE>
|
|
|
|
</PRE>
|
|
<H2>NAME</H2><PRE>
|
|
cdiff - context diff
|
|
|
|
|
|
</PRE>
|
|
<H2>SYNOPSIS</H2><PRE>
|
|
<STRONG>cdiff</STRONG> [<STRONG>-c</STRONG><EM>n</EM>] <EM>oldfile</EM> <EM>newfile</EM>
|
|
|
|
|
|
</PRE>
|
|
<H2>OPTIONS</H2><PRE>
|
|
|
|
<STRONG>-c</STRONG> Provide <EM>n</EM> lines of context
|
|
|
|
|
|
</PRE>
|
|
<H2>EXAMPLES</H2><PRE>
|
|
|
|
<STRONG>cdiff</STRONG> <STRONG>old</STRONG> <STRONG>new</STRONG> <STRONG>>f</STRONG> # Write context diff on <EM>f</EM>
|
|
|
|
<STRONG>cdiff</STRONG> <STRONG>-c1</STRONG> <STRONG>old</STRONG> <STRONG>new</STRONG> <STRONG>>f</STRONG>
|
|
# Use only 1 line of context
|
|
|
|
|
|
</PRE>
|
|
<H2>DESCRIPTION</H2><PRE>
|
|
|
|
<EM>Cdiff</EM> produces a context diff by first running <EM>diff</EM> and then adding
|
|
context. Some update programs, like <EM>patch</EM>, can use context diffs to
|
|
update files, even in the presence of other, independent changes.
|
|
|
|
|
|
</PRE>
|
|
<H2>SEE ALSO</H2><PRE>
|
|
<STRONG><A HREF="../man1/cmp.1.html">cmp(1)</A></STRONG>, <STRONG><A HREF="../man1/diff.1.html">diff(1)</A></STRONG>, <STRONG><A HREF="../man1/patch.1.html">patch(1)</A></STRONG>.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</PRE>
|
|
</BODY>
|
|
</HTML>
|