Rename and invert a private API parameter, for clarity.

* subversion/libsvn_client/client.h,
  subversion/libsvn_client/resolved.c
  (svn_client__resolve_conflicts): Rename and invert the sense of the
    'resolved' output, to become 'conflicts_remain'.

* subversion/libsvn_client/merge.c
  (do_merge): Track the change.

Suggested by: rhuijben


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