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


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