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

Posted to commits@subversion.apache.org by ju...@apache.org on 2018/09/12 19:06:18 UTC

svn commit: r1840740 - /subversion/trunk/subversion/include/svn_client.h

Author: julianfoad
Date: Wed Sep 12 19:06:18 2018
New Revision: 1840740

URL: http://svn.apache.org/viewvc?rev=1840740&view=rev
Log:
* subversion/include/svn_client.h
  (svn_client_conflict_option_id_t): Annotate enumerators that are new in 1.11.

Modified:
    subversion/trunk/subversion/include/svn_client.h

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1840740&r1=1840739&r2=1840740&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Sep 12 19:06:18 2018
@@ -4559,11 +4559,11 @@ typedef enum svn_client_conflict_option_
 
   /* Options for local move vs incoming edit on merge. */
   svn_client_conflict_option_local_move_file_text_merge,
-  svn_client_conflict_option_local_move_dir_merge,
+  svn_client_conflict_option_local_move_dir_merge, /**< @since New in 1.11. */
 
   /* Options for local missing vs incoming edit on merge. */
-  svn_client_conflict_option_sibling_move_file_text_merge,
-  svn_client_conflict_option_sibling_move_dir_merge,
+  svn_client_conflict_option_sibling_move_file_text_merge, /**< @since New in 1.11. */
+  svn_client_conflict_option_sibling_move_dir_merge, /**< @since New in 1.11. */
 
 } svn_client_conflict_option_id_t;