Follow-up to r27253: Fix one last conflict-callback API violation.
Follow-up to r27253: Fix one last conflict-callback API violation.

* subversion/libsvn_wc/merge.c
  (svn_wc__merge_internal): Raise error if the callback doesn't return
    a result_t object.


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

wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion