* subversion/libsvn_client/merge.c
  (merge_file_added): Set use_sleep here, in the only place where we introduce
    unmodified nodes, instead of globally on every merge drive.
  (do_file_merge): Remove comment of old setter. (Accidentally changed in
    r1443030)


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