[PATCH] Fix number of array elements

[Stefan]

Hi,

hope this patch is correct... As far as I  see the number of elements is
off by one here:

[[[
Allocate the correct number of element entries.

* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_text_get_resolution_options): Correct number of array
  entires.
]]]


Regards,
Stefan


Index: subversion/libsvn_client/conflicts.c
===================================================================
--- subversion/libsvn_client/conflicts.c	(revision 1764425)
+++ subversion/libsvn_client/conflicts.c	(working copy)
@@ -7138,7 +7138,7 @@
 
   SVN_ERR(assert_text_conflict(conflict, scratch_pool));
 
-  *options = apr_array_make(result_pool, 6,
+  *options = apr_array_make(result_pool, 7,
                             sizeof(svn_client_conflict_option_t *));
 
   add_resolution_option(*options, conflict,

smime.p7s
Description: S/MIME Cryptographic Signature