All error handling to be done using the error() function.

* contrib/client-side/svnmerge.py
  (error): Moved function to top of the file (well, almost ;)
  (global - during check for python version):
  (main):
  (check_old_prop_version): Replace code to print error message, exit(1)
                            with call to error().