* subversion/libsvn_wc/merge.c:   (eval_conflict_func_result): note a bug, with a resulting question
* subversion/libsvn_wc/merge.c:
  (eval_conflict_func_result): note a bug, with a resulting question

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