Author: stsp
Date: Tue Feb 16 13:42:06 2016
New Revision: 1730688
URL: http://svn.apache.org/viewvc?rev=1730688&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
(resolve_tree_conflict_on_node): Fix comment for clarity.
Modified:
subversion/trunk/subversion/libsvn_wc/conflicts.c
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1730688&r1=1730687&r2=1730688&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Feb 16 13:42:06 2016
@@ -2693,8 +2693,9 @@ resolve_tree_conflict_on_node(svn_boolea
{
svn_skel_t *new_conflicts;
- /* Raise moved-away conflicts on any children moved out of
- * this directory, and leave this directory as-is.
+ /* Raise local moved-away vs. incoming edit conflicts on
+ * any children moved out of this directory, and leave
+ * this directory as-is.
*
* The newly conflicted moved-away children will be updated
* if they are resolved with 'mine_conflict' as well. */
