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 2014/05/19 14:33:09 UTC

svn propchange: r1595522 - svn:log

Author: danielsh
Revision: 1595522
Modified property: svn:log

Modified: svn:log at Mon May 19 12:33:09 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Mon May 19 12:33:09 2014
@@ -2,8 +2,11 @@ Render property conflicts with diff3.
 
 Thread: http://mail-archives.apache.org/mod_mbox/subversion-dev/201405.mbox/%3C20140506110855.GA1948@tarsus.local2%3E
 
+r1591951 applied a similar change to text conflicts.
+
 * subversion/libsvn_wc/props.c
-  (prop_conflict_from_skel): Always use INCOMING_BASE as the diff3 "older".
+  (prop_conflict_from_skel):
+    Always use INCOMING_BASE as the diff3 "older".
     Add detailed comment.
 
 * subversion/tests/cmdline/merge_tests.py
@@ -17,4 +20,3 @@ Thread: http://mail-archives.apache.org/
 * subversion/tests/cmdline/prop_tests.py
   (file_matching_dir_prop_reject):
     Add comment.  No functional change.
-