Author: stsp
Date: Wed Mar 11 16:16:16 2015
New Revision: 1665928
URL: http://svn.apache.org/r1665928
Log:
* STATUS (1.8.x): Vote for 1.8.x-r1660220 branch.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1665928&r1=1665927&r2=1665928&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Mar 11 16:16:16 2015
@@ -55,13 +55,16 @@ Candidate changes:
Votes:
+1: rhuijben
- * r1660220
+ * r1660220, r1665874
Don't leave conflict markers on files that are moved
+ Branch:
+ ^/subversion/branches/1.8.x-r1660220
Justification:
Without this patch property or text conflicted files that are moved
leave dangling conflict markers in the old location. Easy fix.
Votes:
- +1: rhuijben
+ +1: stsp
+ +1: rhuijben (without r1665874)
* r1532287
Simplify Windows resource compilation to avoid warnings
