* 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


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

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion