* subversion/libsvn_wc/conflicts.c   (resolve_conflict_on_node): Update doc string to match current parameters.
* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Update doc string to match current parameters.

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

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