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 2018/06/19 13:37:48 UTC

svn commit: r1833843 - /subversion/branches/1.10.x/STATUS

Author: stsp
Date: Tue Jun 19 13:37:47 2018
New Revision: 1833843

URL: http://svn.apache.org/viewvc?rev=1833843&view=rev
Log:
* STATUS: Add r1833842 to issue #4740 fix.

Modified:
    subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1833843&r1=1833842&r2=1833843&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Jun 19 13:37:47 2018
@@ -39,7 +39,7 @@ Candidate changes:
    Votes:
      +1: jorton, stsp
 
- * r1833836
+ * r1833836, r1833842
    Fix issue #4740, "conflict resolver searches too far back ..."
    Justification:
      The current behaviour is hard-coded to traverse all of history in