* subversion/tests/cmdline/merge_tests.py   (del_differing_file): Unbreak this test by adjusting expected output    to account for change made in r33784.
* subversion/tests/cmdline/merge_tests.py
  (del_differing_file): Unbreak this test by adjusting expected output
   to account for change made in r33784.

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