You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/05/04 19:54:31 UTC
svn propchange: r1099440 - svn:log
Author: danielsh
Revision: 1099440
Modified property: svn:log
Modified: svn:log at Wed May 4 17:54:31 2011
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed May 4 17:54:31 2011
@@ -2,5 +2,6 @@
(close_file): Following up on r1099236, only keep the recorded information
if the merge outcome is unchanged. Without this fix the recorded
information was not cleared when the file got into a text conflict.
- (And if you happen to use SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE
- _SLEEP_FOR_TIMESTAMPS, that might hide some modifications)
+ (And if you happen to use
+ SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_SLEEP_FOR_TIMESTAMPS,
+ that might hide some modifications)