* subversion/svn/conflict-callbacks.c
  (prop_conflict_options): Correct the help messages to talk about 'property'
    instead of 'file'.

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