Fix some merge-tracking OBOEs.
Fix some merge-tracking OBOEs.

* subversion/libsvn_client/merge.c
  (do_merge, discover_and_merge_children): Fix a couple of off-by-one
    errors that happen when the merge target directory is the current
    working directory.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@864589 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion