On the 'tree-conflicts' branch:
On the 'tree-conflicts' branch:

Further fix two tree-conflicts tests.

Patch by: Neels Hofmeyr <neels@elego.de>

* subversion/tests/cmdline/update_tests.py
  (tree_conflicts_on_update_2_1, tree_conflicts_on_update_2_2): Adjust
    the expected status to reflect the local changes.


git-svn-id: 080e87057772675a7b26c87dbedb1538c5b5954e@872983 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion