Author: stsp Revision: 1213665 Modified property: svn:log Modified: svn:log at Tue Dec 13 12:48:59 2011 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Tue Dec 13 12:48:59 2011 @@ -1 +1,2 @@ -* site/docs/svn-merge.txt: Put current output of 'svn help merge' in here. +* site/publish/docs/svn-merge.txt: Put current output of 'svn help merge' + in here.