[svnbook commit] r3072 - trunk/src/en/book
cmpilato
noreply at red-bean.com
Tue May 6 01:40:06 CDT 2008
Author: cmpilato
Date: Tue May 6 01:40:05 2008
New Revision: 3072
Log:
Use … instead of explicit "..." when the triple-dots aren't literal.
Modified:
trunk/src/en/book/ch02-basic-usage.xml
trunk/src/en/book/ch04-branching-and-merging.xml
Modified: trunk/src/en/book/ch02-basic-usage.xml
==============================================================================
--- trunk/src/en/book/ch02-basic-usage.xml (original)
+++ trunk/src/en/book/ch02-basic-usage.xml Tue May 6 01:40:05 2008
@@ -1077,7 +1077,7 @@
typing <replaceable>h</replaceable>:</para>
<screen>
-...
+…
(p) postpone - mark the conflict to be resolved later
(df) diff-full - show all changes made to merged file
(e) edit - change merged file in an editor
@@ -1199,7 +1199,7 @@
(<command>d</command>) is what you'll use for this:</para>
<screen>
-...
+…
Select: (p) postpone, (df) diff-full, (e) edit, (h)elp for more options : d
--- .svn/text-base/sandwich.txt.svn-base Tue Dec 11 21:33:57 2007
+++ .svn/tmp/tempfile.32.tmp Tue Dec 11 21:34:33 2007
@@ -1210,7 +1210,7 @@
+=======
+Bring me a taco!
+>>>>>>> .r32
-...
+…
</screen>
<para>The first line of the diff content shows the previous
Modified: trunk/src/en/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/en/book/ch04-branching-and-merging.xml (original)
+++ trunk/src/en/book/ch04-branching-and-merging.xml Tue May 6 01:40:05 2008
@@ -1688,11 +1688,11 @@
<screen>
$ svn blame button.c
-...
+…
390 user retval = inverse_func(button, path);
390 user return retval;
390 user }
-...
+…
</screen>
<para>And while it's true that you did actually commit those
@@ -1701,11 +1701,11 @@
<screen>
$ svn blame button.c -g
-...
+…
G 383 sally retval = inverse_func(button, path);
G 383 sally return retval;
390 user }
-...
+…
</screen>
<para>Now we know who to <emphasis>really</emphasis> blame for
More information about the svnbook-dev
mailing list