Follow-up to r34091, adjust expected output in a merge test to work with debug builds.
Follow-up to r34091, adjust expected output in a merge test to work with
debug builds.

Suggested by: cmpilato

* subversion/tests/cmdline/merge_tests.py
  (reintegrate_with_subtree_mergeinfo): Debug builds also output the
  file/lineno of the error, so expect that.

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