[svnbook] r3838 committed - * src/en/book/ch04-branching-and-merging.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Fri Jun 24 09:37:07 CDT 2011
Revision: 3838
Author: cmpilato at gmail.com
Date: Fri Jun 24 07:36:02 2011
Log: * src/en/book/ch04-branching-and-merging.xml
"mishmosh" => "mishmash"
Patch by: Richard Cavell <richardcavell at mail.com>
http://code.google.com/p/svnbook/source/detail?r=3838
Modified:
/trunk/src/en/book/ch04-branching-and-merging.xml
=======================================
--- /trunk/src/en/book/ch04-branching-and-merging.xml Fri Oct 15 10:52:07
2010
+++ /trunk/src/en/book/ch04-branching-and-merging.xml Fri Jun 24 07:36:02
2011
@@ -780,7 +780,7 @@
<para>When merging your branch back to the trunk, however, the
underlying mathematics is quite different. Your feature
- branch is now a mishmosh of both duplicated trunk changes and
+ branch is now a mishmash of both duplicated trunk changes and
private branch changes, so there's no simple contiguous range
of revisions to copy over. By specifying
the <option>--reintegrate</option> option, you're asking
More information about the svnbook-dev
mailing list