Author: stsp
Revision: 1026105
Modified property: svn:log
Modified: svn:log at Fri Oct 22 09:51:02 2010
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Fri Oct 22 09:51:02 2010
@@ -1,3 +1,6 @@
+[ Note from the future: This commit was reverted in r1026270 because
+ it made the buildbots fail ]
+
* subversion/libsvn_wc/merge.c
(merge_text_file): Don't leak temporary file RESULT_TARGET.
E.g. when a text conflict happened during an update, and the user
