* contrib/client-side/emacs/psvn.el   (svn-status-update-cmd): Pass --non-interactive option to update, so     the new interactive conflict prompting doesn't cause a hang.
* contrib/client-side/emacs/psvn.el
  (svn-status-update-cmd): Pass --non-interactive option to update, so
    the new interactive conflict prompting doesn't cause a hang.

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