You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2016/04/18 12:42:41 UTC

svn commit: r1739739 - /subversion/trunk/subversion/libsvn_client/conflicts.c

Author: stsp
Date: Mon Apr 18 10:42:41 2016
New Revision: 1739739

URL: http://svn.apache.org/viewvc?rev=1739739&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (conflict_type_specific_setup): Update a comment. We can now describe all
   incoming changes (well, except moves, but those don't count, for now).

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1739739&r1=1739738&r2=1739739&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Apr 18 10:42:41 2016
@@ -4480,7 +4480,7 @@ conflict_type_specific_setup(svn_client_
   operation = svn_client_conflict_get_operation(conflict);
   incoming_change = svn_client_conflict_get_incoming_change(conflict);
 
-  /* Set type-specific description and details functions if available. */
+  /* Set type-specific description and details functions. */
   if (incoming_change == svn_wc_conflict_action_delete ||
       incoming_change == svn_wc_conflict_action_replace)
     {