subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn propchange: r1758160 - svn:log
Date Sun, 28 Aug 2016 22:35:59 GMT
Author: rhuijben
Revision: 1758160
Modified property: svn:log

Modified: svn:log at Sun Aug 28 22:35:59 2016
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sun Aug 28 22:35:59 2016
@@ -1,5 +1,6 @@
-Allow resolving conflicts on binary files to the base version, just like
-text files.
+Following up on r1687821, allow resolving conflicts on binary files to the base
+version, just like text files. Fixes a regression against older Subversion
+versions.
 
 * subversion/libsvn_client/conflicts.c
   (binary_conflict_options): Add missing option.


Mime
View raw message