svnmerge.py: Because 'svn merge' in 1.5 can trigger interactive conflict resolution, pass --non-interactive to it.  For good measure, pass --non-interactive to *all* svn invocations (all commands that svnmerge.py currently invokes do accept --non-interactive).
svnmerge.py: Because 'svn merge' in 1.5 can trigger interactive
conflict resolution, pass --non-interactive to it.  For good measure,
pass --non-interactive to *all* svn invocations (all commands that
svnmerge.py currently invokes do accept --non-interactive).

(Ideally, svnmerge.py should invoke svn in such a way that the user
could actually interact with the interaction prompt; this patch at
least prevents the script from hanging.)

* contrib/client-side/svnmerge/svnmerge.py
  (launchsvn): Pass --non-interactive to all svn commands.

Review by: giovannibajo
           dlr

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