* subversion/libsvn_client/merge.c
  (merge_locked): Clean up the clean-up code after a 2-URL merge so that we
    always sleep for time stamps if needed and always clear the session pool.

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