* subversion/tests/cmdline/merge_tests.py   (tree_conflicts_on_merge_local_ci_5_1): Correct a reference to a     nonexistent variable. The test XFails, but now for a genuine reason.
* subversion/tests/cmdline/merge_tests.py
  (tree_conflicts_on_merge_local_ci_5_1): Correct a reference to a
    nonexistent variable. The test XFails, but now for a genuine reason.

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