os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Clarify the term 'context diff' at the cvs diff mini-guide part,

Browse source 
to make it obvious that it refers to diff -c.
This commit is contained in:
Giorgos Keramidas 2002-05-12 23:18:17 +00:00
parent dd52cb7d97
commit ba54fb4341
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=13056
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -583,11 +583,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.119 2002-05-12 23:15:26 keramida Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.120 2002-05-12 23:18:17 keramida Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.119 2002-05-12 23:15:26 keramida Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.119 2002-05-12 23:15:26 keramida Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.120 2002-05-12 23:18:17 keramida Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.120 2002-05-12 23:18:17 keramida Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -610,6 +610,11 @@
<entry>Uses the unified diff format.</entry>
</row>
<row>
<entry><option>-c</option></entry>
<entry>Uses the context diff format.</entry>
</row>
<row>
<entry><option>-N</option></entry>
<entry>Shows missing or added files.</entry>
@ -620,7 +625,7 @@
<para>You always want to use <option>-u</option>, since
unified diffs are much easier to read than almost any other
diff format (in some circumstances, context diffs may be
diff format (in some circumstances, context diffs generated with the <option>-c</option> option may be
better, but they are much bulkier). A unified diff consists of
a series of hunks. Each hunk begins with a line that starts
with two <literal>@</literal> signs and specifies where in the