Follow-up to r1667692:
Follow-up to r1667692:

Blind attempt to fix a build failure with Windows compilers:
conflict-callbacks.c(746): error C2466: cannot allocate an array of
constant size 0

* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Allocate options dynamically.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1667699 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion