Tweak the summary of conflicts.  If any conflicts were resolved during the
merge, and thus we are using the long form of message -- '%d remaining (and
%d already resolved)' -- then use that form of message for all three kinds
of conflict.  This should make the meaning slighlty clearer.

* subversion/svn/notify.c
  (svn_cl__notifier_print_conflict_stats): As above.


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