* subversion/svn/conflict-callbacks.c   (binary_conflict_options): Fix indentation.   (tree_conflict_options_update_moved_away,    tree_conflict_options_update_edit_deleted_dir): Split inline --accept    option values off conflict descriptions, as done elsewhere in r1725982.
* subversion/svn/conflict-callbacks.c
  (binary_conflict_options): Fix indentation.
  (tree_conflict_options_update_moved_away,
   tree_conflict_options_update_edit_deleted_dir): Split inline --accept
   option values off conflict descriptions, as done elsewhere in r1725982.


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

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