Let's try this again with all the code we need ...
Let's try this again with all the code we need ...

* subversion/tests/cmdline/update_tests.py
  (conflict_markers_matching_eol): We do need to assign a value, even if
                                   it always the same.

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

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