Make "h" and "?" work at the conflict prompt as promised by the help text.

* subversion/svn/conflict-callbacks.c
  (prompt_user): Test for "h" and "?" before calling find_option,
    not after.

Patch by: Mattias Engdegård <mattiase{_AT_}bredband.net>


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