subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1434933 - /subversion/trunk/subversion/svn/cl.h
Date Thu, 17 Jan 2013 22:14:33 GMT
Author: julianfoad
Date: Thu Jan 17 22:14:33 2013
New Revision: 1434933

URL: http://svn.apache.org/viewvc?rev=1434933&view=rev
Log:
* subversion/svn/cl.h
  (svn_cl__accept_t): Remove obsolete comments.

Modified:
    subversion/trunk/subversion/svn/cl.h

Modified: subversion/trunk/subversion/svn/cl.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl.h?rev=1434933&r1=1434932&r2=1434933&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl.h (original)
+++ subversion/trunk/subversion/svn/cl.h Thu Jan 17 22:14:33 2013
@@ -65,15 +65,11 @@ typedef enum svn_cl__accept_t
   svn_cl__accept_working,
 
   /* Resolve the conflicted hunks by choosing the corresponding text
-     from the pre-conflict working copy file.
-
-     Note: this is a placeholder, not actually implemented in 1.5. */
+     from the pre-conflict working copy file. */
   svn_cl__accept_mine_conflict,
 
   /* Resolve the conflicted hunks by choosing the corresponding text
-     from the post-conflict base copy file.
-
-     Note: this is a placeholder, not actually implemented in 1.5. */
+     from the post-conflict base copy file. */
   svn_cl__accept_theirs_conflict,
 
   /* Resolve the conflict by taking the entire pre-conflict working



Mime
View raw message