You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2012/09/27 16:10:28 UTC

svn propchange: r1391019 - svn:log

Author: stsp
Revision: 1391019
Modified property: svn:log

Modified: svn:log at Thu Sep 27 14:10:28 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Thu Sep 27 14:10:28 2012
@@ -5,6 +5,7 @@ with an svn:executable property.
   (eval_text_conflict_func_result, resolve_conflict_on_node): When installing
    a resolved file, also set up a work queue task to sync file flags.
    The resolution source might be a temp file with different permission bits.
+  (save_merge_result): Accidental unrelated whitespace change.
 
 * subversion/tests/cmdline/resolve_tests.py
   (auto_resolve_executable_file): New test, which verifies the above fix