* subversion/libsvn_client/resolved.c   (svn_client__resolve_conflicts): Avoid unneeded check once we now at least     one conflict remains.
* subversion/libsvn_client/resolved.c
  (svn_client__resolve_conflicts): Avoid unneeded check once we now at least
    one conflict remains.


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

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