Author: stsp
Revision: 1494657
Modified property: svn:log
Modified: svn:log at Wed Jun 19 15:35:24 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Jun 19 15:35:24 2013
@@ -3,5 +3,5 @@ Remove duplicate invocations of the conf
* subversion/libsvn_wc/update_editor.c
(mark_directory_edited, mark_file_edited): Don't invoke the conflict
resolver here, the close_file() and close_directory() functions take
- care of this as of r1491868.
+ care of this already.