Author: hwright Revision: 993356 Modified property: svn:log Modified: svn:log at Tue Sep 7 13:44:38 2010 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Tue Sep 7 13:44:38 2010 @@ -1,2 +1,5 @@ Revert r992041, as a result of this discussion: http://svn.haxx.se/dev/archive-2010-09/0044.shtml + +Note: this revert itself accidentally included a change for ConflictVersion, +which will shortly be reverted.
- svn propchange: r993356 - svn:log hwright
