Author: stsp
Revision: 1846851
Modified property: svn:log
Modified: svn:log at Sun Nov 18 17:06:41 2018
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sun Nov 18 17:06:41 2018
@@ -7,7 +7,7 @@ after a merge operation:
(M) - move 'file-target' to 'file-source' and merge
where 'file-branch' is the path the file has on the merge target branch,
-and 'file-trunk' is the path the file has on the merge source branch.
+and 'file-source' is the path the file has on the merge source branch.
The 'm' option applies textual changes only and leaves the tree structure
of the merge target as it is. The 'M' option changes the file's location in
