From richardcavell at users.sourceforge.net Sat May 10 16:02:49 2025 From: richardcavell at users.sourceforge.net (richardcavell at users.sourceforge.net) Date: Sat, 10 May 2025 16:02:49 +0000 Subject: =?UTF-8?Q?=5Bsvnbook=5D_r6067_committed_-_trunk/en/book/ch04-branching-an?= =?UTF-8?Q?d-merging=2Exml?= Message-ID: <1746892969.817190.4946@sfp-scm-3.v30.lw.sourceforge.com> Revision: 6067 http://sourceforge.net/p/svnbook/source/6067 Author: richardcavell Date: 2025-05-10 16:02:49 +0000 (Sat, 10 May 2025) Log Message: ----------- Format the text nicely. Modified Paths: -------------- trunk/en/book/ch04-branching-and-merging.xml Modified: trunk/en/book/ch04-branching-and-merging.xml =================================================================== --- trunk/en/book/ch04-branching-and-merging.xml 2024-11-11 16:43:09 UTC (rev 6066) +++ trunk/en/book/ch04-branching-and-merging.xml 2025-05-10 16:02:49 UTC (rev 6067) @@ -906,8 +906,7 @@ patch format, so there are some ideas it simply can't express. Even Subversion's own svn patch subcommand, while more flexible than the patch - program, still has - similar limitations. + program, still has similar limitations. The svn merge command, however, can express changes in tree structure and properties by directly