Fix a text expectation: expect a file to be gone from disk when a "delete + delete" tree conflict is raised.
Fix a text expectation: expect a file to be gone from disk when a "delete +
delete" tree conflict is raised.

Remaining failures after this change are:
FAIL:  update_tests.py 7: update that deletes modified files
FAIL:  update_tests.py 47: tree conflicts on update 1.2
FAIL:  update_tests.py 48: tree conflicts on update 2.1
FAIL:  update_tests.py 49: tree conflicts on update 2.2
FAIL:  update_tests.py 51: tree conflicts on update 3
FAIL:  switch_tests.py 32: tree conflicts on switch 1.2
FAIL:  switch_tests.py 33: tree conflicts on switch 2.1
FAIL:  switch_tests.py 34: tree conflicts on switch 2.2
FAIL:  switch_tests.py 35: tree conflicts on switch 3
FAIL:  revert_tests.py 19: revert tree conflicts in updated files
FAIL:  stat_tests.py 31: status with tree conflicts
FAIL:  tree_conflict_tests.py 6: up/sw dir: del/rpl/mv onto modify

* subversion/tests/cmdline/commit_tests.py
  (tree_conflicts_resolved): Tweak.


git-svn-id: 0890bf2c45022e9e8eccf47ea9ef1a2305ee3e7d@875397 13f79535-47bb-0310-9956-ffa450edef68

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