Change interactive conflict prompt menus to always display 'postpone',
'quit', and 'help' as the last three options. Needed for upcoming
changes which attempt to better guide users in choosing appropriate
options at the conflict prompt. We should put any automatic tree conflict
resolution options first in the list, for instance.

Suggested by: ivan

* subversion/svn/conflict-callbacks.c
  (text_conflict_options, prop_conflict_options, obstructed_add_options,
   tree_conflict_options, tree_conflict_options_update_moved_away,
   tree_conflict_options_update_deleted,
   tree_conflict_options_update_replaced): Move 'p' option before 'q'.


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