* subversion/libsvn_wc/adm_ops.c   (resolve_conflict_on_entry): Only do auto-accept if we're trying to    resolve text.
* subversion/libsvn_wc/adm_ops.c
  (resolve_conflict_on_entry): Only do auto-accept if we're trying to
   resolve text.


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

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