* subversion/include/svn_client.h
(svn_client_conflict_option_id_t): Annotate enumerators that are new in 1.11.
@@ -4559,11 +4559,11 @@ typedef enum svn_client_conflict_option_id_t {
/* 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;
