Follow-up to r1351792:
Follow-up to r1351792:

* subversion/libsvn_client/merge.c
  (merge_locked, merge_peg_locked, do_symmetric_merge_locked): Fix copy-pasted
   name of the local variable 'resolve_conflicts_post_update' to say
   'resolve_conflicts_post_merge'.

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