Another (and hopefully the last) expectation tweak for issue #3354's test.
Another (and hopefully the last) expectation tweak for issue #3354's test.

* subversion/tests/cmdline/update_tests.py
  (update_moves_and_modifies_an_edited_file): Account for the filename.mine,
  filename.rNEWREV, and filename.copied conflict files on expected disk.
  If, like me, you were expecting filename.rOLDREV, see issue #2986 and
  r27377.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@875462 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion