[svnbook] r4743 committed - Merge from trunk r4742.
svnbook at googlecode.com
svnbook at googlecode.com
Mon Apr 7 10:01:42 CDT 2014
Revision: 4743
Author: cmpilato at gmail.com
Date: Mon Apr 7 15:01:30 2014 UTC
Log: Merge from trunk r4742.
http://code.google.com/p/svnbook/source/detail?r=4743
Modified:
/branches/1.7/en
/branches/1.7/en/book/ch02-basic-usage.xml
=======================================
--- /branches/1.7/en/book/ch02-basic-usage.xml Thu Jan 31 21:09:26 2013 UTC
+++ /branches/1.7/en/book/ch02-basic-usage.xml Mon Apr 7 15:01:30 2014 UTC
@@ -1632,11 +1632,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