Author: stsp
Date: Wed May 15 14:40:09 2013
New Revision: 1482869
URL: http://svn.apache.org/r1482869
Log:
* CHANGES: Clarify an entry.
Modified:
subversion/trunk/CHANGES
Modified: subversion/trunk/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1482869&r1=1482868&r2=1482869&view=diff
==============================================================================
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Wed May 15 14:40:09 2013
@@ -74,7 +74,7 @@ http://svn.apache.org/repos/asf/subversi
* svn:mergeinfo related operations now use much less memory (r1149519 et
al)
* get list of supported schemes for RA libraries (r1148134)
* 'svn checkout' skips file externals from other repositories (r1153110)
- * return an error when conflicts could not be resolved (r1150439)
+ * 'svn resolve' exits non-zero if conflicts could not be resolved
(r1150439)
* let HTTPv2-aware clients fetch v2-style resources (r1161202)
* 'svn status' with better NLS support (r1157537, -682)
* better tracking of shallow-yet-complete merges (issues #4056, #4057)
