[svnbook] r4742 committed - * en/book/ch02-basic-usage.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Mon Apr 7 09:59:40 CDT 2014
Revision: 4742
Author: cmpilato at gmail.com
Date: Mon Apr 7 14:59:26 2014 UTC
Log: * en/book/ch02-basic-usage.xml
Wording tweak around .mine file description for clarity.
Suggested by: Stevens Miller <steve at millerhousehold.com>
http://code.google.com/p/svnbook/source/detail?r=4742
Modified:
/trunk/en/book/ch02-basic-usage.xml
=======================================
--- /trunk/en/book/ch02-basic-usage.xml Fri Feb 8 18:32:43 2013 UTC
+++ /trunk/en/book/ch02-basic-usage.xml Mon Apr 7 14:59:26 2014 UTC
@@ -1666,11 +1666,11 @@
<varlistentry>
<term><filename>filename.mine</filename></term>
<listitem>
- <para>This is your file as it existed in your
- working copy before you began the update process.
- This version of the file contains your local
- modifications as well as conflict markers. (If
- Subversion considers the file to be unmergeable,
+ <para>This is the file as it existed in your working
+ copy before you began the update process. It
+ contains any local modifications you had made to
+ the file up to that point. (If Subversion
+ considers the file to be unmergeable,
the <filename>.mine</filename> file isn't created,
since it would be identical to the working
file.)</para>
More information about the svnbook-dev
mailing list