Use a boolean to determine when a conflict is resolved, instead of a few values in an enum, which are eventually just compared to a single value.
Use a boolean to determine when a conflict is resolved, instead of a few
values in an enum, which are eventually just compared to a single value.

* subversion/libsvn_wc/conflicts.c
  (eval_text_conflict_func_result): Simplify output argument.
  (resolve_text_conflicts): Don't call eval_text_conflict_func_result for
    postponing and return result as boolean.
  (svn_wc__conflict_invoke_resolver): Simplify code by not checking a faked
    merge result.


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

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