* subversion/libsvn_wc/conflicts.c   (conflict_status_walker):     Don't call conflict resolver functions on conflicts that we are not going     to resolve anyway.
* subversion/libsvn_wc/conflicts.c
  (conflict_status_walker):
    Don't call conflict resolver functions on conflicts that we are not going
    to resolve anyway.


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

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