Fix up interactions between conflicts, sleep-for-timestamps, and reporting
other errors, following r1445761.

* subversion/libsvn_client/merge.c
  (merge_locked, merge_reintegrate_locked, do_automatic_merge_locked): Use a
    consistent source code style.
  (merge_peg_locked): Do things in a correct and consistent order: if there
    are conflicts we still need to sleep for timestamps and report any
    'real' error.


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