Add scary words to interactive conflict handler prompt.
Add scary words to interactive conflict handler prompt.

* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_handler): Tweak interactive conflict resolution
    prompt to hopefully clarify that choosing "mine" or "theirs"
    doesn't mean "resolve conflicting hunks to X's favor" but
    "completely revert/ignore Y's changes to the file in favor of
    X's".  This distinction is critical (and not understanding it has
    twice caused me to lose work).  Hopefully scary words like
    "ignore" and "revert" will prevent others from making the same
    mistakes I did.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion