* subversion/libsvn_wc/conflicts.c   (svn_wc__conflict_skel_set_op_merge): Set the right operation in the skel.
* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_skel_set_op_merge): Set the right operation in the skel.

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