Allow svn-resolve (R) on lines with tree conflicts as well, not just
text conflicts.

* contrib/client-side/emacs/dsvn.el
  (svn-resolve): Accept lines with tree conflicts.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1431615 13f79535-47bb-0310-9956-ffa450edef68