Fix a silly bug in r1213018 that made several merge tests fail.
Fix a silly bug in r1213018 that made several merge tests fail.

* subversion/libsvn_client/merge.c^M  (merge_locked): Use the right variable.

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

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