Fix a typo added in r1440411 that makes 'r' always allowed in the interactive
conflict resolver.

* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Change from result->choice to opt->choice.  The
    value in result->choice is not set at this point.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1577294 13f79535-47bb-0310-9956-ffa450edef68