* 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.
* 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: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1445417 13f79535-47bb-0310-9956-ffa450edef68

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