Followup to r27477: make sure the merge_authz test actually passes!
Followup to r27477: make sure the merge_authz test actually passes!

* subversion/tests/cmdline/merge_authz_tests.py
  (): Import setup_branch and shorten_path_kludge from merge_tests.py.
  (shorten_path_kludge): Remove, as it is now imported.


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

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