Add scary words to interactive conflict handler prompt.
commitd01bc1704d070bf6ea95553f0a0c96739dfa474e
authorcmpilato <cmpilato@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a>
Thu, 24 Jan 2008 17:13:52 +0000 (24 17:13 +0000)
committercmpilato <cmpilato@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a>
Thu, 24 Jan 2008 17:13:52 +0000 (24 17:13 +0000)
tree705d0f993d113bcb9827256687625cb07dbbde9a
parent4103c8d3c158e01187810b2f06a5557bae5f7576
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.

git-svn-id: http://svn.collab.net/repos/svn/trunk@29008 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
subversion/svn/conflict-callbacks.c