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.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion