* subversion/svn/svn.c
  (svn_cl__cmd_table): In the merge help text, rename the 'automatic' merge
   invocation syntax to 'complete' merge. Julian and I came to the conclusion
   that calling the new merge feature 'automatic merge' may cause misperception
   because people might associate automatic merging of functionality such
   as server-side merges or automatic conflict resolution, while it is really
   about detecting whether or not a reintegrate merge is needed.
   Since the 'svn merge' now runs either sync or reintegrate, we call this
   invocation the 'complete' merge, in contrast with the 'cherry-pick' and
   the more complex '2-URL' merge invocations.


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