Prevent the interactive conflict resolver from segfaulting on "df" and "m" options for binary files by hiding these options.
Prevent the interactive conflict resolver from segfaulting on "df" and "m"
options for binary files by hiding these options.

This is a mere workaround and not a proper fix to underlying state model.

* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Add TODO marking the whole logic as "outdated".
                          Make sure the MY_ABSPATH string is available
                          for those options that will use it.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1645578 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion