Author: stsp
Date: Wed Jan 23 14:34:45 2019
New Revision: 1851925
URL: http://svn.apache.org/viewvc?rev=1851925&view=rev
Log:
* CHANGES: Mention that 'move vs. move' merge conflicts can now be resolved.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1851925&r1=1851924&r2=1851925&view=diff
==============================================================================
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Wed Jan 23 14:34:45 2019
@@ -12,6 +12,7 @@ https://svn.apache.org/repos/asf/subvers
- Major new features:
- Minor new features and improvements:
+ * 'move vs. move' merge conflicts can now be resolved (r1846851, r1851913)
* 'svn --version --verbose' shows loaded libraries on Linux (r1843774)
* 'svnrdump' can read/write a file instead of stdin/stdout (r1844906)
* 'svn list' tries to not truncate the authior's name (r1847384 et al.)