Author: stsp Revision: 1491816 Modified property: svn:log Modified: svn:log at Tue Jun 11 14:49:33 2013 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Tue Jun 11 14:49:33 2013 @@ -1,4 +1,4 @@ -Add options to the interactive file merge which concanenate conflicted +Add options to the interactive file merge which concatenate conflicted 'their' and 'mine' versions. This is useful when resolving text conflicts in append-only files. @@ -10,4 +10,4 @@ during the file merge, then pick 'r' to * subversion/svn/file-merge.c (merge_chunks): Add new options "12" and "21" which can be used to - concanenate conflicted chunks in either order. + concatenate conflicted chunks in either order.
